Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

Issue 7645032: Profiles: Fix ZOOM_LEVEL_CHANGE overlisten in mac code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: {} Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
index c50e0771aa895a36304f3502c335c0e12c749cbf..68f0754ceccd4886de843625b4c153a144f7c810 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
@@ -13,6 +13,7 @@
#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"
@@ -36,7 +37,7 @@ class ZoomLevelObserver : public NotificationObserver {
explicit ZoomLevelObserver(WrenchMenuController* controller)
: controller_(controller) {
registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
- NotificationService::AllSources());
+ NotificationService::AllBrowserContextsAndSources());
}
void Observe(int type,
@@ -44,6 +45,11 @@ class ZoomLevelObserver : public NotificationObserver {
const NotificationDetails& details) {
DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED);
WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel];
+ if (wrenchMenuModel->browser()->profile()->GetHostZoomMap() !=
+ Source<HostZoomMap>(source).ptr()) {
+ return;
+ }
+
wrenchMenuModel->UpdateZoomControls();
const string16 level =
wrenchMenuModel->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698