ntp: remove ntp3 resources

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 <set>
 
@@ skipping 175 matching lines @@
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabUI
 
 NewTabUI::NewTabUI(TabContents* contents)
     : ChromeWebUI(contents) {
   // Override some options on the Web UI.
   hide_favicon_ = true;
 
-  if (!NTP4Enabled() &&
-      GetProfile()->GetPrefs()->GetBoolean(prefs::kEnableBookmarkBar) &&
-      browser_defaults::bookmarks_enabled) {
-    set_force_bookmark_bar_visible(true);
-  }
-
   focus_location_bar_by_default_ = true;
   should_hide_url_ = true;
   overridden_title_ = l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE);
 
   // We count all link clicks as AUTO_BOOKMARK, so that site can be ranked more
   // highly. Note this means we're including clicks on not only most visited
   // thumbnails, but also clicks on recently bookmarked.
   link_transition_type_ = PageTransition::AUTO_BOOKMARK;
 
   if (!GetProfile()->IsOffTheRecord()) {
     PrefService* pref_service = GetProfile()->GetPrefs();
     if (!NewTabSyncSetupHandler::ShouldShowSyncPromo())
       AddMessageHandler((new NTPLoginHandler())->Attach(this));
     AddMessageHandler((new ShownSectionsHandler(pref_service))->Attach(this));
     AddMessageHandler((new browser_sync::ForeignSessionHandler())->
         Attach(this));
     AddMessageHandler((new MostVisitedHandler())->Attach(this));
     AddMessageHandler((new RecentlyClosedTabsHandler())->Attach(this));
     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));
   }
 
   // Add the sync setup handler for the sync promo UI.
   scoped_ptr<SyncSetupHandler> handler(new NewTabSyncSetupHandler());
   AddMessageHandler(handler.release()->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,
                  Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
-  // Listen for bookmark bar visibility changes.
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
-                 NotificationService::AllSources());
 }
 
 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 40 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_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED: {
-      if (GetProfile()->GetPrefs()->IsManagedPreference(
-              prefs::kEnableBookmarkBar)) {
-        break;
-      }
-      if (!NTP4Enabled()) {
-        if (GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar))
-          CallJavascriptFunction("bookmarkBarAttached");
-        else
-          CallJavascriptFunction("bookmarkBarDetached");
-      }
-      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) {
   prefs->RegisterIntegerPref(prefs::kNTPPrefVersion,
                              0,
                              PrefService::UNSYNCABLE_PREF);
 
   NewTabPageHandler::RegisterUserPrefs(prefs);
   AppLauncherHandler::RegisterUserPrefs(prefs);
   MostVisitedHandler::RegisterUserPrefs(prefs);
   ShownSectionsHandler::RegisterUserPrefs(prefs);
-  if (NTP4Enabled())
-    BookmarksHandler::RegisterUserPrefs(prefs);
+  BookmarksHandler::RegisterUserPrefs(prefs);
 
   UpdateUserPrefsVersion(prefs);
 }
 
 // static
 bool NewTabUI::UpdateUserPrefsVersion(PrefService* prefs) {
   const int old_pref_version = prefs->GetInteger(prefs::kNTPPrefVersion);
   if (old_pref_version != current_pref_version()) {
     MigrateUserPrefs(prefs, old_pref_version, current_pref_version());
     prefs->SetInteger(prefs::kNTPPrefVersion, current_pref_version());
@@ skipping 52 matching lines @@
         direction = kRTLHtmlTextDirection;
       } else {
         base::i18n::WrapStringWithLTRFormatting(&title_to_set);
       }
     }
   }
   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 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage);
-#endif
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabHTMLSource
 
 NewTabUI::NewTabHTMLSource::NewTabHTMLSource(Profile* profile)
     : DataSource(chrome::kChromeUINewTabHost, MessageLoop::current()),
       profile_(profile) {
 }
 
 void NewTabUI::NewTabHTMLSource::StartDataRequest(const std::string& path,
                                                   bool is_incognito,
@@ 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;
 }