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

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

Issue 490123003: Move bookmark_pref_names.* into bookmarks namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 6 years, 4 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/ui/webui/ntp/new_tab_ui.cc ('k') | components/bookmarks/common/bookmark_pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index b079445b9edbb907ae2467787cc32aea88d2e5a3..6d172805ec088d1279c377ac7ac5e8d0ab3c21ca 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -172,7 +172,8 @@ NTPResourceCache::NTPResourceCache(Profile* profile)
// Watch for pref changes that cause us to need to invalidate the HTML cache.
profile_pref_change_registrar_.Init(profile_->GetPrefs());
- profile_pref_change_registrar_.Add(prefs::kShowBookmarkBar, callback);
+ profile_pref_change_registrar_.Add(bookmarks::prefs::kShowBookmarkBar,
+ callback);
profile_pref_change_registrar_.Add(prefs::kNtpShownPage, callback);
profile_pref_change_registrar_.Add(prefs::kSignInPromoShowNTPBubble,
callback);
@@ -313,8 +314,8 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
l10n_util::GetStringUTF16(new_tab_link_ids));
localized_strings.SetString("learnMoreLink", new_tab_link);
- bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean(
- prefs::kShowBookmarkBar);
+ bool bookmark_bar_attached =
+ profile_->GetPrefs()->GetBoolean(bookmarks::prefs::kShowBookmarkBar);
localized_strings.SetBoolean("bookmarkbarattached", bookmark_bar_attached);
webui::SetFontAndTextDirection(&localized_strings);
@@ -390,7 +391,7 @@ void NTPResourceCache::CreateNewTabHTML() {
PrefService* prefs = profile_->GetPrefs();
base::DictionaryValue load_time_data;
load_time_data.SetBoolean("bookmarkbarattached",
- prefs->GetBoolean(prefs::kShowBookmarkBar));
+ prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
load_time_data.SetBoolean("hasattribution",
ThemeServiceFactory::GetForProfile(profile_)->HasCustomImage(
IDR_THEME_NTP_ATTRIBUTION));
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui.cc ('k') | components/bookmarks/common/bookmark_pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698