Remove TOUCH_UI specific new tab page.

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

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 79 matching lines @@
     AddMessageHandler((new MetricsHandler())->Attach(this));
     if (GetProfile()->IsSyncAccessible())
       AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
     ExtensionService* service = GetProfile()->GetExtensionService();
     // We might not have an ExtensionService (on ChromeOS when not logged in
     // for example).
     if (service)
       AddMessageHandler((new AppLauncherHandler(service))->Attach(this));
 
     AddMessageHandler((new NewTabPageHandler())->Attach(this));
-    if (NTP4Enabled()) {
-      AddMessageHandler((new BookmarksHandler())->Attach(this));
-      AddMessageHandler((new FaviconWebUIHandler())->Attach(this));
-    }
+    AddMessageHandler((new BookmarksHandler())->Attach(this));
+    AddMessageHandler((new FaviconWebUIHandler())->Attach(this));
   }
 
   if (NTPLoginHandler::ShouldShow(GetProfile()))
     AddMessageHandler((new NTPLoginHandler())->Attach(this));
 
   // 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());
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
-  // Listen for bookmark bar visibility changes.
-  pref_change_registrar_.Init(GetProfile()->GetPrefs());
-  pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
 }
 
 NewTabUI::~NewTabUI() {
 }
 
 // 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
   // finished.  Observed times are in the ~1200ms range on Windows.
@@ skipping 50 matching lines @@
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       InitializeCSSCaches();
       ListValue args;
       args.Append(Value::CreateStringValue(
           ThemeServiceFactory::GetForProfile(GetProfile())->HasCustomImage(
               IDR_THEME_NTP_ATTRIBUTION) ?
           "true" : "false"));
       CallJavascriptFunction("themeChanged", args);
       break;
     }
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      const std::string& pref_name =
-          *content::Details<std::string>(details).ptr();
-      if (pref_name == prefs::kShowBookmarkBar) {
-        if (!NTP4Enabled() && CanShowBookmarkBar()) {
-          if (GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar))
-            CallJavascriptFunction("bookmarkBarAttached");
-          else
-            CallJavascriptFunction("bookmarkBarDetached");

[Evan Stade, 2011/11/30 03:42:20]

technically, I think we may need this all for ntp4. We don't listen to it right
but we should (because top-anchored backgrounds are supposed to change when you
enable/disable the bookmark bar). I've just been too lazy to get around to
fixing that and no one has complained.

[Rick Byers, 2011/11/30 14:29:34]

Ah, ok.  Sounds pretty low priority, so I'll commit this as-is for now - easy
enough to bring it back if/when we decide to fix that issue...

-        }
-      } else {
-        NOTREACHED();
-      }
-      break;
-    }
     case content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT: {
       last_paint_ = base::TimeTicks::Now();
       break;
     }
     default:
       CHECK(false) << "Unexpected notification: " << type;
   }
 }
 
 void NewTabUI::InitializeCSSCaches() {
   Profile* profile = GetProfile();
   ThemeSource* theme = new ThemeSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(theme);
 }
 
 // static
 void NewTabUI::RegisterUserPrefs(PrefService* prefs) {
   NewTabPageHandler::RegisterUserPrefs(prefs);
   AppLauncherHandler::RegisterUserPrefs(prefs);
   MostVisitedHandler::RegisterUserPrefs(prefs);
-  if (NTP4Enabled())
-    BookmarksHandler::RegisterUserPrefs(prefs);
+  BookmarksHandler::RegisterUserPrefs(prefs);
 }
 
 // static
 void NewTabUI::SetURLTitleAndDirection(DictionaryValue* dictionary,
                                        const string16& title,
                                        const GURL& gurl) {
   dictionary->SetString("url", gurl.spec());
 
   bool using_url_as_the_title = false;
   string16 title_to_set(title);
@@ skipping 19 matching lines @@
       base::i18n::StringContainsStrongRTLChars(title)) {
     direction = kRTLHtmlTextDirection;
   } else {
     direction = kLTRHtmlTextDirection;
   }
   dictionary->SetString("title", title_to_set);
   dictionary->SetString("direction", direction);
 }
 
 // static
-bool NewTabUI::NTP4Enabled() {
-#if defined(TOUCH_UI)
-  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage);
-#else
-  return true;
-#endif
-}
-
-// static
 bool NewTabUI::NTP4BookmarkFeaturesEnabled() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
-  return NTP4Enabled() && cl->HasSwitch(switches::kEnableNTPBookmarkFeatures);
+  return cl->HasSwitch(switches::kEnableNTPBookmarkFeatures);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabHTMLSource
 
 NewTabUI::NewTabHTMLSource::NewTabHTMLSource(Profile* profile)
     : DataSource(chrome::kChromeUINewTabHost, MessageLoop::current()),
       profile_(profile) {
 }
 
@@ skipping 16 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;
 }