Removed access to prefs that does not work on Android

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 375 matching lines @@
   std::string anim =
       ui::Animation::ShouldRenderRichAnimation() ? "true" : "false";
   localized_strings.SetString("anim", anim);
 
   int alignment;
   ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
   tp->GetDisplayProperty(ThemeService::NTP_BACKGROUND_ALIGNMENT, &alignment);
   localized_strings.SetString("themegravity",
       (alignment & ThemeService::ALIGN_RIGHT) ? "right" : "");
 
+#if !defined(OS_ANDROID)
   // 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) &&
       prefs->FindPreference(prefs::kNtpCustomLogoEnd)) {
     localized_strings.SetString("customlogo",
         InDateRange(prefs->GetDouble(prefs::kNtpCustomLogoStart),
                     prefs->GetDouble(prefs::kNtpCustomLogoEnd)) ?
         "true" : "false");
   } else {
     localized_strings.SetString("customlogo", "false");
   }
+#else
+  localized_strings.SetString("customlogo", "false");
+#endif
 
+#if !defined(OS_ANDROID)

[Yaron, 2012/04/09 18:31:54]

ENABLE_*

[Jerome, 2012/04/09 20:10:52]

Done.

   // If the user has preferences for a start and end time for a promo from
   // 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(
       switches::kDisableNTPOtherSessionsMenu);
   localized_strings.SetBoolean("showOtherSessionsMenu",
                                show_other_sessions_menu);
   localized_strings.SetBoolean("isUserSignedIn",
       !prefs->GetString(prefs::kGoogleServicesUsername).empty());
 
   // Load the new tab page appropriate for this build
@@ skipping 124 matching lines @@
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }