Profiles: Fix ZOOM_LEVEL_CHANGE overlisten in mac code.

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.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.
 
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
+#include "chrome/browser/profiles/profile.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 
 @interface WrenchMenuController (Private)
 - (void)adjustPositioning;
 - (void)performCommandDispatch:(NSNumber*)tag;
 - (NSButton*)zoomDisplay;
 @end
 
 namespace WrenchMenuControllerInternal {
 
 class ZoomLevelObserver : public NotificationObserver {
  public:
   explicit ZoomLevelObserver(WrenchMenuController* controller)
       : controller_(controller) {
     registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
-                   NotificationService::AllSources());
+                   NotificationService::AllBrowserContextsAndSources());
   }
 
   void Observe(int type,
                const NotificationSource& source,
                const NotificationDetails& details) {
     DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED);
     WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel];
+    if (wrenchMenuModel->browser()->profile()->GetHostZoomMap() !=
+        Source<HostZoomMap>(source).ptr())

[Robert Sesek, 2011/08/16 21:18:00]

nit: Wrapped ifs should have {}

+      return;
+
     wrenchMenuModel->UpdateZoomControls();
     const string16 level =
         wrenchMenuModel->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY);
     [[controller_ zoomDisplay] setTitle:SysUTF16ToNSString(level)];
   }
 
  private:
   NotificationRegistrar registrar_;
   WrenchMenuController* controller_;  // Weak; owns this.
 };
@@ skipping 167 matching lines @@
   parentFrame.size.width += delta;
   parentFrame.origin.x -= delta;
   [[editCut_ superview] setFrame:parentFrame];
 }
 
 - (NSButton*)zoomDisplay {
   return zoomDisplay_;
 }
 
 @end  // @implementation WrenchMenuController