More.

chrome/browser/ui/gtk/global_menu_bar.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/global_menu_bar.h"
 
 #include <gtk/gtk.h>
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 196 matching lines @@
                                  dummy_accel_group_,
                                  accelerator_gtk->GetGdkKeyCode(),
                                  accelerator_gtk->gdk_modifier_type(),
                                  GTK_ACCEL_VISIBLE);
     }
 
     browser_->command_updater()->AddCommandObserver(it->first, this);
   }
 
   // Listen for bookmark bar visibility changes and set the initial state.
-  Source<Profile> source(browser->profile());
   registrar_.Add(this,
                  chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
-                 source);
+                 NotificationService::AllSources());

[Peter Kasting, 2011/08/10 21:03:21]

Nit: AllBrowserContextsAndSources()?

Might also want the comment I suggested in browser.cc.

[Elliot Glaysher, 2011/08/10 21:19:23]

Done.

   Observe(chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
-          source, NotificationService::NoDetails());
+          Source<Profile>(browser->profile()),
+          NotificationService::NoDetails());
 }
 
 GlobalMenuBar::~GlobalMenuBar() {
   Disable();
   g_object_unref(dummy_accel_group_);
 }
 
 void GlobalMenuBar::Disable() {
   for (CommandIDMenuItemMap::const_iterator it = id_to_menu_item_.begin();
        it != id_to_menu_item_.end(); ++it) {
     browser_->command_updater()->RemoveCommandObserver(it->first, this);
   }
   id_to_menu_item_.clear();
-  Source<Profile> source(browser_->profile());
+
   if (registrar_.IsRegistered(this,
                     chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
-                    source)) {
+                    NotificationService::AllBrowserContextsAndSources())) {
     registrar_.Remove(
         this,
         chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
-        source);
+        NotificationService::AllBrowserContextsAndSources());
   }
 }
 
 void GlobalMenuBar::BuildGtkMenuFrom(
     int menu_str_id,
     std::map<int, GtkWidget*>* id_to_menu_item,
     GlobalMenuBarCommand* commands,
     GlobalMenuOwner* owner) {
   GtkWidget* menu = gtk_menu_new();
   for (int i = 0; commands[i].str_id != MENU_END; ++i) {
@@ skipping 60 matching lines @@
 void GlobalMenuBar::EnabledStateChangedForCommand(int id, bool enabled) {
   CommandIDMenuItemMap::iterator it = id_to_menu_item_.find(id);
   if (it != id_to_menu_item_.end())
     gtk_widget_set_sensitive(it->second, enabled);
 }
 
 void GlobalMenuBar::Observe(int type,
                             const NotificationSource& source,
                             const NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED);
-  DCHECK_EQ(Source<Profile>(source).ptr(), browser_->profile());
+
+  if (!browser_->profile()->IsSameProfile(Source<Profile>(source).ptr()))
+    return;
 
   CommandIDMenuItemMap::iterator it =
       id_to_menu_item_.find(IDC_SHOW_BOOKMARK_BAR);
   if (it != id_to_menu_item_.end()) {
     PrefService* prefs = browser_->profile()->GetPrefs();
 
     block_activation_ = true;
     gtk_check_menu_item_set_active(
         GTK_CHECK_MENU_ITEM(it->second),
         prefs->GetBoolean(prefs::kShowBookmarkBar));
     block_activation_ = false;
   }
 }
 
 void GlobalMenuBar::OnItemActivated(GtkWidget* sender) {
   if (block_activation_)
     return;
 
   int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), "command-id"));
   browser_->ExecuteCommandIfEnabled(id);
 }