Fixed behavior of the bookmark bar visibility.

chrome/browser/ui/gtk/global_menu_bar.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_GLOBAL_MENU_BAR_H_
 #define CHROME_BROWSER_UI_GTK_GLOBAL_MENU_BAR_H_
 
 #include <map>
 
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/browser/ui/gtk/global_bookmark_menu.h"
+#include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/ui/gtk/global_history_menu.h"
 #include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 
 class Browser;
+class GlobalBookmarkMenu;
 struct GlobalMenuBarCommand;
 class GlobalMenuOwner;
 
 typedef struct _GtkAccelGroup GtkAccelGroup;
 typedef struct _GtkWidget GtkWidget;
 
 // Controls the Mac style menu bar on Linux.
 //
 // Unity and some configurations of GNOME have a Apple-like menu bar at the top
 // of the screen that changes depending on the active window. These mainly work
@@ skipping 37 matching lines @@
                            GtkWidget* menu_to_add_to);
 
   // CommandUpdater::CommandObserver:
   virtual void EnabledStateChangedForCommand(int id, bool enabled);
 
   // NotificationObserver:
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // Updates the visibility of the bookmark bar on pref changes.
+  void OnBookmarkBarVisibilityChanged();
+
   CHROMEGTK_CALLBACK_0(GlobalMenuBar, void, OnItemActivated);
 
   Browser* browser_;
 
-  NotificationRegistrar registrar_;
+  // Tracks value of the kShowBookmarkBar preference.
+  PrefChangeRegistrar pref_change_registrar_;
 
   // Our menu bar widget.
   ui::OwnedWidgetGtk menu_bar_;
 
   // Listens to the TabRestoreService and the HistoryService and keeps the
   // history menu fresh.
   GlobalHistoryMenu history_menu_;
 
   // Listens to the bookmark model and updates the menu.
   scoped_ptr<GlobalBookmarkMenu> bookmark_menu_;
 
   // For some menu items, we want to show the accelerator, but not actually
   // explicitly handle it. To this end we connect those menu items' accelerators
   // to this group, but don't attach this group to any top level window.
   GtkAccelGroup* dummy_accel_group_;
 
   // A mapping from command ids to GtkMenuItem objects. We use this to update
   // the command enable state.
   CommandIDMenuItemMap id_to_menu_item_;
 
   // gtk_check_menu_item_set_active() will call the "activate" signal. We need
   // to block this activation while we change the checked state.
   bool block_activation_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_GLOBAL_MENU_BAR_H_