Commit a5c1ae42 authored by erg@chromium.org's avatar erg@chromium.org

Profiles: Fix ZOOM_LEVEL_CHANGE overlisten in mac code.

BUG=87457
TEST=none


Review URL: http://codereview.chromium.org/7645032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97083 0039d316-1c4b-4281-b951-d872f2087c98
parent 6e64f17e
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.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/ui/toolbar/wrench_menu_model.h"
#include "chrome/browser/profiles/profile.h"
#include "content/browser/user_metrics.h" #include "content/browser/user_metrics.h"
#include "content/common/content_notification_types.h" #include "content/common/content_notification_types.h"
#include "content/common/notification_observer.h" #include "content/common/notification_observer.h"
...@@ -36,7 +37,7 @@ class ZoomLevelObserver : public NotificationObserver { ...@@ -36,7 +37,7 @@ class ZoomLevelObserver : public NotificationObserver {
explicit ZoomLevelObserver(WrenchMenuController* controller) explicit ZoomLevelObserver(WrenchMenuController* controller)
: controller_(controller) { : controller_(controller) {
registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED, registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
NotificationService::AllSources()); NotificationService::AllBrowserContextsAndSources());
} }
void Observe(int type, void Observe(int type,
...@@ -44,6 +45,11 @@ class ZoomLevelObserver : public NotificationObserver { ...@@ -44,6 +45,11 @@ class ZoomLevelObserver : public NotificationObserver {
const NotificationDetails& details) { const NotificationDetails& details) {
DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED); DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED);
WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel]; WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel];
if (wrenchMenuModel->browser()->profile()->GetHostZoomMap() !=
Source<HostZoomMap>(source).ptr()) {
return;
}
wrenchMenuModel->UpdateZoomControls(); wrenchMenuModel->UpdateZoomControls();
const string16 level = const string16 level =
wrenchMenuModel->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY); wrenchMenuModel->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment