| Index: chrome/browser/ui/webui/ntp/new_tab_ui.cc
|
| diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
|
| index d15c15487918305e8273028f38bcd62747a432fe..6b1079420ba5b04c2e1401eea97cc9747d851bd7 100644
|
| --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
|
| +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
|
| @@ -174,8 +174,7 @@ bool NewTabUI::CanShowBookmarkBar() const {
|
| bool disabled_by_policy =
|
| prefs->IsManagedPreference(prefs::kShowBookmarkBar) &&
|
| !prefs->GetBoolean(prefs::kShowBookmarkBar);
|
| - return
|
| - browser_defaults::bookmarks_enabled &&
|
| + return browser_defaults::bookmarks_enabled &&
|
| !disabled_by_policy &&
|
| !NTP4BookmarkFeaturesEnabled();
|
| }
|
| @@ -298,7 +297,7 @@ bool NewTabUI::NTP4Enabled() {
|
| #if defined(TOUCH_UI)
|
| return CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage);
|
| #else
|
| - return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage);
|
| + return true;
|
| #endif
|
| }
|
|
|
|
|