Chromium Code Reviews| Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm |
| diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm |
| index 7c72d564f19b9168192d6089b8db1cf70dfa6d81..0af9998d6ce4e517a04b66b60526a052be676d3a 100644 |
| --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm |
| +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm |
| @@ -81,7 +81,7 @@ const CGFloat kWrenchMenuLeftPadding = 3.0; |
| } // namespace |
| -@interface ToolbarController(Private) |
| +@interface ToolbarController() |
| - (void)addAccessibilityDescriptions; |
| - (void)initCommandStatus:(CommandUpdater*)commands; |
| - (void)prefChanged:(std::string*)prefName; |
| @@ -95,6 +95,9 @@ const CGFloat kWrenchMenuLeftPadding = 3.0; |
| - (void)browserActionsVisibilityChanged:(NSNotification*)notification; |
| - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate; |
| - (void)badgeWrenchMenuIfNeeded; |
| + |
| +@property(assign, nonatomic) Browser* browser; |
|
Robert Sesek
2011/09/19 18:57:36
@property goes above method declarations
sail
2011/09/19 19:19:59
Done.
|
| + |
| @end |
| namespace ToolbarControllerInternal { |
| @@ -128,6 +131,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 +144,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 +162,8 @@ class NotificationBridge : public NotificationObserver { |
| @implementation ToolbarController |
| +@synthesize browser = browser_; |
| + |
| - (id)initWithModel:(ToolbarModel*)model |
| commands:(CommandUpdater*)commands |
| profile:(Profile*)profile |