Chromium Code Reviews| Index: chrome/browser/ui/gtk/global_menu_bar.cc |
| diff --git a/chrome/browser/ui/gtk/global_menu_bar.cc b/chrome/browser/ui/gtk/global_menu_bar.cc |
| index 4bfd2bd0631a3bb37dc3840ce293939f56e95eef..b64ac2b233f56fc03930837fb142d1e9c8e86e81 100644 |
| --- a/chrome/browser/ui/gtk/global_menu_bar.cc |
| +++ b/chrome/browser/ui/gtk/global_menu_bar.cc |
| @@ -214,12 +214,12 @@ GlobalMenuBar::GlobalMenuBar(Browser* browser) |
| } |
| // 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 w
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() { |
| @@ -233,14 +233,14 @@ void GlobalMenuBar::Disable() { |
| 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()); |
| } |
| } |
| @@ -321,7 +321,9 @@ 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); |