Commit ef9f775c authored by estade@chromium.org's avatar estade@chromium.org

Revert 113137 - ntp: remove default thumbnail for most visited (broken camera)

BUG=92421
TEST=none

Review URL: http://codereview.chromium.org/8817010

TBR=estade@chromium.org
Review URL: http://codereview.chromium.org/8817011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113140 0039d316-1c4b-4281-b951-d872f2087c98
parent feb7f6db
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
<if expr="not pp_ifdef('_google_chrome')"> <if expr="not pp_ifdef('_google_chrome')">
<include name="IDR_CUSTOM_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" /> <include name="IDR_CUSTOM_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" />
</if> </if>
<include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="BINDATA" />
<include name="IDR_DOCK_HIGH" file="dock_tab_high.png" type="BINDATA" /> <include name="IDR_DOCK_HIGH" file="dock_tab_high.png" type="BINDATA" />
<include name="IDR_DOCK_MAX" file="dock_tab_max.png" type="BINDATA" /> <include name="IDR_DOCK_MAX" file="dock_tab_max.png" type="BINDATA" />
<include name="IDR_DOCK_WIDE" file="dock_tab_wide.png" type="BINDATA" /> <include name="IDR_DOCK_WIDE" file="dock_tab_wide.png" type="BINDATA" />
......
...@@ -95,8 +95,6 @@ html[dir=rtl] .most-visited .close-button { ...@@ -95,8 +95,6 @@ html[dir=rtl] .most-visited .close-button {
.thumbnail { .thumbnail {
background: no-repeat; background: no-repeat;
/* This shows for missing thumbnails. */
background-color: #eee;
background-size: 100%; background-size: 100%;
border-radius: 3px; border-radius: 3px;
/* These max dimensions are not necessary, as the sizing logic in the .js /* These max dimensions are not necessary, as the sizing logic in the .js
......
...@@ -90,6 +90,12 @@ body { ...@@ -90,6 +90,12 @@ body {
background-color: $6; /* COLOR_NTP_HEADER */ background-color: $6; /* COLOR_NTP_HEADER */
} }
.edit-bar {
background-image: -webkit-linear-gradient(
$7, /* COLOR_HEADER_GRADIENT_LIGHT */
$6); /* COLOR_NTP_HEADER */
}
.thumbnail-wrapper { .thumbnail-wrapper {
/* This shows through at the (rounded) thumbnail's corners. */ /* This shows through at the (rounded) thumbnail's corners. */
background-color: $11; /* COLOR_NTP_SECTION_BORDER */ background-color: $11; /* COLOR_NTP_SECTION_BORDER */
......
...@@ -46,5 +46,11 @@ MessageLoop* ThumbnailSource::MessageLoopForRequestPath( ...@@ -46,5 +46,11 @@ MessageLoop* ThumbnailSource::MessageLoopForRequestPath(
} }
void ThumbnailSource::SendDefaultThumbnail(int request_id) { void ThumbnailSource::SendDefaultThumbnail(int request_id) {
// Use placeholder thumbnail.
if (!default_thumbnail_.get()) {
default_thumbnail_ =
ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
IDR_DEFAULT_THUMBNAIL);
}
SendResponse(request_id, default_thumbnail_); SendResponse(request_id, default_thumbnail_);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment