Move bookmark_pref_names.* into bookmarks namespace.

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 154 matching lines @@
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile)));
   registrar_.Add(this, chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
                  content::NotificationService::AllSources());
 
   base::Closure callback = base::Bind(&NTPResourceCache::OnPreferenceChanged,
                                       base::Unretained(this));
 
   // 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);
   profile_pref_change_registrar_.Add(prefs::kHideWebStoreIcon, callback);
 
   // Some tests don't have a local state.
 #if defined(ENABLE_APP_LIST)
   if (g_browser_process->local_state()) {
     local_state_pref_change_registrar_.Init(g_browser_process->local_state());
     local_state_pref_change_registrar_.Add(prefs::kShowAppLauncherPromo,
@@ skipping 120 matching lines @@
     localized_strings.SetString("incognitoTabHeading",
         l10n_util::GetStringUTF16(new_tab_heading_ids));
     localized_strings.SetString("incognitoTabWarning",
         l10n_util::GetStringUTF16(new_tab_warning_ids));
   }
 
   localized_strings.SetString("learnMore",
       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);
 
   static const base::StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           new_tab_html_idr));
 
   std::string full_html = webui::GetI18nTemplateHtml(
       incognito_tab_html, &localized_strings);
@@ skipping 55 matching lines @@
 }
 
 void NTPResourceCache::CreateNewTabHTML() {
   // TODO(estade): these strings should be defined in their relevant handlers
   // (in GetLocalizedValues) and should have more legible names.
   // Show the profile name in the title and most visited labels if the current
   // profile is not the default.
   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));
   load_time_data.SetBoolean("showMostvisited", should_show_most_visited_page_);
   load_time_data.SetBoolean("showAppLauncherPromo",
       ShouldShowAppLauncherPromo());
   load_time_data.SetBoolean("showRecentlyClosed",
       should_show_recently_closed_menu_);
   load_time_data.SetString("title",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
@@ skipping 309 matching lines @@
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }