Move bookmark_pref_names.* into bookmarks namespace.

chrome/browser/ui/views/frame/global_menu_bar_x11.cc

 // Copyright 2013 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/views/frame/global_menu_bar_x11.h"
 
 #include <dlfcn.h>
 #include <glib-object.h>
 
 #include "base/debug/leak_annotations.h"
@@ skipping 388 matching lines @@
 
     ui::Accelerator accelerator;
     if (browser_view_->GetAccelerator(it->first, &accelerator))
       RegisterAccelerator(it->second, accelerator);
 
     chrome::AddCommandObserver(browser_, it->first, this);
   }
 
   pref_change_registrar_.Init(browser_->profile()->GetPrefs());
   pref_change_registrar_.Add(
-      prefs::kShowBookmarkBar,
+      bookmarks::prefs::kShowBookmarkBar,
       base::Bind(&GlobalMenuBarX11::OnBookmarkBarVisibilityChanged,
                  base::Unretained(this)));
   OnBookmarkBarVisibilityChanged();
 
   top_sites_ = profile_->GetTopSites();
   if (top_sites_) {
     GetTopSitesData();
 
     // Register for notification when TopSites changes so that we can update
     // ourself.
@@ skipping 153 matching lines @@
   }
 }
 
 void GlobalMenuBarX11::OnBookmarkBarVisibilityChanged() {
   CommandIDMenuItemMap::iterator it =
       id_to_menu_item_.find(IDC_SHOW_BOOKMARK_BAR);
   if (it != id_to_menu_item_.end()) {
     PrefService* prefs = browser_->profile()->GetPrefs();
     // Note: Unlike the GTK version, we don't appear to need to do tricks where
     // we block activation while setting the toggle.
-    menuitem_property_set_int(it->second, kPropertyToggleState,
-                              prefs->GetBoolean(prefs::kShowBookmarkBar));
+    menuitem_property_set_int(
+        it->second,
+        kPropertyToggleState,
+        prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
   }
 }
 
 int GlobalMenuBarX11::GetIndexOfMenuItemWithTag(DbusmenuMenuitem* menu,
                                                 int tag_id) {
   GList* childs = menuitem_get_children(menu);
   int i = 0;
   for (; childs != NULL; childs = childs->next, i++) {
     int tag =
         GPOINTER_TO_INT(g_object_get_data(G_OBJECT(childs->data), kTypeTag));
@@ skipping 186 matching lines @@
       tab_restore_service_->LoadTabsFromLastSession();
       tab_restore_service_->AddObserver(this);
 
       // If LoadTabsFromLastSession doesn't load tabs, it won't call
       // TabRestoreServiceChanged(). This ensures that all new windows after
       // the first one will have their menus populated correctly.
       TabRestoreServiceChanged(tab_restore_service_);
     }
   }
 }