Chrome on Android : Begin removing references to themes.

chrome/browser/ui/webui/ntp/new_tab_ui.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 "build/build_config.h"
 
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
@@ skipping 104 matching lines @@
     ExtensionService* service = GetProfile()->GetExtensionService();
     // We might not have an ExtensionService (on ChromeOS when not logged in
     // for example).
     if (service)
       web_ui->AddMessageHandler(new AppLauncherHandler(service));
 
     web_ui->AddMessageHandler(new NewTabPageHandler());
     web_ui->AddMessageHandler(new FaviconWebUIHandler());
   }
 
-  if (NTPLoginHandler::ShouldShow(GetProfile()))
-    web_ui->AddMessageHandler(new NTPLoginHandler());
-
   // Initializing the CSS and HTML can require some CPU, so do it after
   // we've hooked up the most visited handler.  This allows the DB query
   // for the new tab thumbs to happen earlier.
   InitializeCSSCaches();
   NewTabHTMLSource* html_source =
       new NewTabHTMLSource(GetProfile()->GetOriginalProfile());
   GetProfile()->GetChromeURLDataManager()->AddDataSource(html_source);
 
   pref_change_registrar_.Init(GetProfile()->GetPrefs());
   pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
+
+#if !defined(OS_ANDROID)
+  if (NTPLoginHandler::ShouldShow(GetProfile()))
+    web_ui->AddMessageHandler(new NTPLoginHandler());
+
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
+#endif
 }
 
 NewTabUI::~NewTabUI() {
   g_live_new_tabs.Pointer()->erase(this);
 }
 
 // The timer callback.  If enough time has elapsed since the last paint
 // message, we say we're done painting; otherwise, we keep waiting.
 void NewTabUI::PaintTimeout() {
   // The amount of time there must be no painting for us to consider painting
@@ skipping 47 matching lines @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PREF_CHANGED: {  // kShowBookmarkBar
       StringValue attached(
           GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar) ?
               "true" : "false");
       web_ui()->CallJavascriptFunction("ntp.setBookmarkBarAttached", attached);
       break;
     }
+#if !defined(OS_ANDROID)
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       InitializeCSSCaches();
       StringValue attribution(
           ThemeServiceFactory::GetForProfile(GetProfile())->HasCustomImage(
               IDR_THEME_NTP_ATTRIBUTION) ? "true" : "false");
       web_ui()->CallJavascriptFunction("ntp.themeChanged", attribution);
       break;
     }
+#endif
     case content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT: {
       last_paint_ = base::TimeTicks::Now();
       break;
     }
     default:
       CHECK(false) << "Unexpected notification: " << type;
   }
 }
 
 void NewTabUI::InitializeCSSCaches() {
+#if !defined(OS_ANDROID)
   Profile* profile = GetProfile();
   ThemeSource* theme = new ThemeSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(theme);
+#endif
 }
 
 // static
 void NewTabUI::RegisterUserPrefs(PrefService* prefs) {
   NewTabPageHandler::RegisterUserPrefs(prefs);
   AppLauncherHandler::RegisterUserPrefs(prefs);
   MostVisitedHandler::RegisterUserPrefs(prefs);
 }
 
 // static
@@ skipping 99 matching lines @@
   SendResponse(request_id, html_bytes);
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const {
   return "text/html";
 }
 
 bool NewTabUI::NewTabHTMLSource::ShouldReplaceExistingSource() const {
   return false;
 }