Chromium Code Reviews| Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc |
| diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc |
| index 27a22cf0cf56c7c27165e7b5f285a13739db6f1a..3076de73589cc8e233f256c2c4e9d17579ab8404 100644 |
| --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc |
| +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc |
| @@ -393,6 +393,7 @@ void NTPResourceCache::CreateNewTabHTML() { |
| localized_strings.SetString("themegravity", |
| (alignment & ThemeService::ALIGN_RIGHT) ? "right" : ""); |
| +#if defined(ENABLE_PROMO_RESOURCE_SERVICE) |
| // If the user has preferences for a start and end time for a custom logo, |
| // and the time now is between these two times, show the custom logo. |
| if (prefs->FindPreference(prefs::kNtpCustomLogoStart) && |
| @@ -404,13 +405,18 @@ void NTPResourceCache::CreateNewTabHTML() { |
| } else { |
| localized_strings.SetString("customlogo", "false"); |
| } |
| +#else |
| + localized_strings.SetString("customlogo", "false"); |
| +#endif |
| +#if defined(ENABLE_PROMO_RESOURCE_SERVICE) |
| // If the user has preferences for a start and end time for a promo from |
|
Yaron
2012/04/09 20:38:55
Nit: Move this into the above if-clause.
Jerome
2012/04/09 22:17:31
Done.
|
| // the server, and this promo string exists, set the localized string. |
| if (PromoResourceService::CanShowNotificationPromo(profile_)) { |
| localized_strings.SetString("serverpromo", |
| prefs->GetString(prefs::kNtpPromoLine)); |
| } |
| +#endif |
| // Determine whether to show the menu for accessing tabs on other devices. |
| bool show_other_sessions_menu = !CommandLine::ForCurrentProcess()->HasSwitch( |