More.

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // 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/cocoa/browser_window_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
@@ skipping 34 matching lines @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/rect.h"
 
 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser,
                                        BrowserWindowController* controller,
                                        NSWindow* window)
   : browser_(browser),
     controller_(controller),
     confirm_close_factory_(browser) {
-  // This pref applies to all windows, so all must watch for it.
+  // Listen for bookmark bar visibility changes and set the initial state; we
+  // need to listen to all profiles because of normal profile/incognito issues.
   registrar_.Add(this,
                  chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
-                 NotificationService::AllSources());
+                 NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this, chrome::NOTIFICATION_SIDEBAR_CHANGED,
-                 NotificationService::AllSources());
+                 Source<SidebarManager>(SidebarManager::GetInstance()));
 }
 
 BrowserWindowCocoa::~BrowserWindowCocoa() {
 }
 
 void BrowserWindowCocoa::Show() {
   // The Browser associated with this browser window must become the active
   // browser at the time |Show()| is called. This is the natural behaviour under
   // Windows, but |-makeKeyAndOrderFront:| won't send |-windowDidBecomeMain:|
   // until we return to the runloop. Therefore any calls to
@@ skipping 530 matching lines @@
   return bridge;
 }
 
 void BrowserWindowCocoa::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   switch (type) {
     // Only the key window gets a direct toggle from the menu.
     // Other windows hear about it from the notification.
     case chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED:
-      [controller_ updateBookmarkBarVisibilityWithAnimation:YES];
+      if (browser_->profile()->IsSameProfile(Source<Profile>(source).ptr()))
+        [controller_ updateBookmarkBarVisibilityWithAnimation:YES];
       break;
     case chrome::NOTIFICATION_SIDEBAR_CHANGED:
       UpdateSidebarForContents(
           Details<SidebarContainer>(details)->tab_contents());
       break;
     default:
       NOTREACHED();  // we don't ask for anything else!
       break;
   }
 }
 
 void BrowserWindowCocoa::DestroyBrowser() {
   [controller_ destroyBrowser];
 
   // at this point the controller is dead (autoreleased), so
   // make sure we don't try to reference it any more.
 }
 
 NSWindow* BrowserWindowCocoa::window() const {
   return [controller_ window];
 }
 
 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
   if (tab_contents == browser_->GetSelectedTabContents()) {
     [controller_ updateSidebarForContents:tab_contents];
   }
 }