Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1143)

Unified Diff: chrome/browser/ui/webui/ntp/new_tab_ui.cc

Issue 8344013: remove ntp3 resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/ntp4/trash.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
}
« no previous file with comments | « chrome/browser/resources/ntp4/trash.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698