| Index: chrome/browser/ui/webui/ntp/new_tab_ui.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/ntp/new_tab_ui.cc (revision 112258)
|
| +++ chrome/browser/ui/webui/ntp/new_tab_ui.cc (working copy)
|
| @@ -25,7 +25,6 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/webui/metrics_handler.h"
|
| #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
|
| -#include "chrome/browser/ui/webui/ntp/bookmarks_handler.h"
|
| #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h"
|
| #include "chrome/browser/ui/webui/ntp/foreign_session_handler.h"
|
| #include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
|
| @@ -97,7 +96,6 @@
|
| AddMessageHandler((new AppLauncherHandler(service))->Attach(this));
|
|
|
| AddMessageHandler((new NewTabPageHandler())->Attach(this));
|
| - AddMessageHandler((new BookmarksHandler())->Attach(this));
|
| AddMessageHandler((new FaviconWebUIHandler())->Attach(this));
|
| }
|
|
|
| @@ -168,9 +166,7 @@
|
| bool disabled_by_policy =
|
| prefs->IsManagedPreference(prefs::kShowBookmarkBar) &&
|
| !prefs->GetBoolean(prefs::kShowBookmarkBar);
|
| - return browser_defaults::bookmarks_enabled &&
|
| - !disabled_by_policy &&
|
| - !NTP4BookmarkFeaturesEnabled();
|
| + return browser_defaults::bookmarks_enabled && !disabled_by_policy;
|
| }
|
|
|
| void NewTabUI::Observe(int type,
|
| @@ -207,7 +203,6 @@
|
| NewTabPageHandler::RegisterUserPrefs(prefs);
|
| AppLauncherHandler::RegisterUserPrefs(prefs);
|
| MostVisitedHandler::RegisterUserPrefs(prefs);
|
| - BookmarksHandler::RegisterUserPrefs(prefs);
|
| }
|
|
|
| // static
|
| @@ -246,12 +241,6 @@
|
| dictionary->SetString("direction", direction);
|
| }
|
|
|
| -// static
|
| -bool NewTabUI::NTP4BookmarkFeaturesEnabled() {
|
| - CommandLine* cl = CommandLine::ForCurrentProcess();
|
| - return cl->HasSwitch(switches::kEnableNTPBookmarkFeatures);
|
| -}
|
| -
|
| ///////////////////////////////////////////////////////////////////////////////
|
| // NewTabHTMLSource
|
|
|
|
|