diff options
-rw-r--r-- | chrome/app/theme/theme_resources.grd | 2 | ||||
-rw-r--r-- | chrome/common/pref_names.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 9f9889b..c2a24b6 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -253,7 +253,7 @@ <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" type="BINDATA" /> - <include name="IDR_CUSTOM_PRODUCT_LOGO" file="google_chrome/product_logo.png" type="BINDATA" /> + <include name="IDR_CUSTOM_PRODUCT_LOGO" file="google_chrome/alt_logo.gif" type="BINDATA" /> </if> <if expr="not pp_ifdef('_google_chrome')"> <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" /> diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 2b54561..30298e5 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -899,7 +899,7 @@ const char kNTPWebResourceCacheUpdate[] = "ntp.web_resource_cache_update"; const char kNTPTipsResourceServer[] = "ntp.tips_resource_server"; // Last server used to fill logo_resource_cache. -const char kNTPLogoResourceServer[] = "ntp.logo_resource_server"; +const char kNTPLogoResourceServer[] = "ntp.alt_logo_resource_server"; // Which sections should be visible on the new tab page // 1 - Show the most visited sites in a grid @@ -914,8 +914,8 @@ const char kNTPPrefVersion[] = "ntp.pref_version"; // Dates between which the NTP should show a custom logo rather than the // standard one. -const char kNTPCustomLogoStart[] = "ntp.custom_logo_start"; -const char kNTPCustomLogoEnd[] = "ntp.custom_logo_end"; +const char kNTPCustomLogoStart[] = "ntp.alt_logo_start"; +const char kNTPCustomLogoEnd[] = "ntp.alt_logo_end"; // A boolean specifying whether dev tools window should be opened docked. const char kDevToolsOpenDocked[] = "devtools.open_docked"; |