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

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

Issue 7068034: Remove the last prefs code from content. I tried hard to move ShouldShowBookmarkBar out of TabCo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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/chrome_content_browser_client.cc ('k') | content/browser/DEPS » ('j') | 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
===================================================================
--- chrome/browser/ui/webui/ntp/new_tab_ui.cc (revision 86679)
+++ chrome/browser/ui/webui/ntp/new_tab_ui.cc (working copy)
@@ -16,6 +16,7 @@
#include "base/string_number_conversions.h"
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/defaults.h"
#include "chrome/browser/metrics/metric_event_duration_details.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -318,8 +319,11 @@
// Override some options on the Web UI.
hide_favicon_ = true;
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4) &&
+ GetProfile()->GetPrefs()->GetBoolean(prefs::kEnableBookmarkBar) &&
+ browser_defaults::bookmarks_enabled) {
force_bookmark_bar_visible_ = true;
+ }
focus_location_bar_by_default_ = true;
should_hide_url_ = true;
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | content/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698