summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 02:42:31 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 02:42:31 +0000
commit95e30e7c7712f4a98768c9dc04233e21acd30a4f (patch)
tree0c380c1bee643fde863da5a5a59825f2f8e4da1c /chrome/browser/ui/cocoa
parent17fbefe1a1cb2314d31ec1082b18d2f172d5eb9d (diff)
downloadchromium_src-95e30e7c7712f4a98768c9dc04233e21acd30a4f.zip
chromium_src-95e30e7c7712f4a98768c9dc04233e21acd30a4f.tar.gz
chromium_src-95e30e7c7712f4a98768c9dc04233e21acd30a4f.tar.bz2
Update error badge on wrench menu button
With this change we now update the error badge on the wrench menu button if a global error is updated, added or removed. BUG=95146 TEST= Review URL: http://codereview.chromium.org/7948003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa')
-rw-r--r--chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index 7c72d56..355ca55 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -81,7 +81,8 @@ const CGFloat kWrenchMenuLeftPadding = 3.0;
} // namespace
-@interface ToolbarController(Private)
+@interface ToolbarController()
+@property(assign, nonatomic) Browser* browser;
- (void)addAccessibilityDescriptions;
- (void)initCommandStatus:(CommandUpdater*)commands;
- (void)prefChanged:(std::string*)prefName;
@@ -128,6 +129,8 @@ class NotificationBridge : public NotificationObserver {
: controller_(controller) {
registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
NotificationService::AllSources());
+ registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
+ Source<Profile>([controller browser]->profile()));
}
// Overridden from NotificationObserver:
@@ -139,6 +142,7 @@ class NotificationBridge : public NotificationObserver {
[controller_ prefChanged:Details<std::string>(details).ptr()];
break;
case chrome::NOTIFICATION_UPGRADE_RECOMMENDED:
+ case chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED:
[controller_ badgeWrenchMenuIfNeeded];
break;
default:
@@ -156,6 +160,8 @@ class NotificationBridge : public NotificationObserver {
@implementation ToolbarController
+@synthesize browser = browser_;
+
- (id)initWithModel:(ToolbarModel*)model
commands:(CommandUpdater*)commands
profile:(Profile*)profile