| Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
|
| index 67b28fb77a8dbe8378c6a5e372590bbce56d37d0..d293d30b9b33783ecc10a83419592bfd1d6d8fb3 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
|
| @@ -186,10 +186,9 @@ class ExtensionServiceObserverBridge
|
| }
|
|
|
| // Overridden from content::NotificationObserver.
|
| - virtual void Observe(
|
| - int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override {
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override {
|
| switch (type) {
|
| case extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
|
| ExtensionPopupController* popup = [ExtensionPopupController popup];
|
| @@ -215,30 +214,26 @@ class ExtensionServiceObserverBridge
|
| }
|
|
|
| // extensions::ExtensionToolbarModel::Observer implementation.
|
| - virtual void ToolbarExtensionAdded(
|
| - const Extension* extension,
|
| - int index) override {
|
| + void ToolbarExtensionAdded(const Extension* extension, int index) override {
|
| [owner_ createActionButtonForExtension:extension withIndex:index];
|
| [owner_ resizeContainerAndAnimate:NO];
|
| }
|
|
|
| - virtual void ToolbarExtensionRemoved(const Extension* extension) override {
|
| + void ToolbarExtensionRemoved(const Extension* extension) override {
|
| [owner_ removeActionButtonForExtension:extension];
|
| [owner_ resizeContainerAndAnimate:NO];
|
| }
|
|
|
| - virtual void ToolbarExtensionMoved(const Extension* extension,
|
| - int index) override {
|
| - }
|
| + void ToolbarExtensionMoved(const Extension* extension, int index) override {}
|
|
|
| - virtual void ToolbarExtensionUpdated(const Extension* extension) override {
|
| + void ToolbarExtensionUpdated(const Extension* extension) override {
|
| BrowserActionButton* button = [owner_ buttonForExtension:extension];
|
| if (button)
|
| [button updateState];
|
| }
|
|
|
| - virtual bool ShowExtensionActionPopup(const Extension* extension,
|
| - bool grant_active_tab) override {
|
| + bool ShowExtensionActionPopup(const Extension* extension,
|
| + bool grant_active_tab) override {
|
| // Do not override other popups and only show in active window.
|
| ExtensionPopupController* popup = [ExtensionPopupController popup];
|
| if (popup || !browser_->window()->IsActive())
|
| @@ -249,15 +244,11 @@ class ExtensionServiceObserverBridge
|
| shouldGrant:grant_active_tab];
|
| }
|
|
|
| - virtual void ToolbarVisibleCountChanged() override {
|
| - }
|
| + void ToolbarVisibleCountChanged() override {}
|
|
|
| - virtual void ToolbarHighlightModeChanged(bool is_highlighting) override {
|
| - }
|
| + void ToolbarHighlightModeChanged(bool is_highlighting) override {}
|
|
|
| - virtual Browser* GetBrowser() override {
|
| - return browser_;
|
| - }
|
| + Browser* GetBrowser() override { return browser_; }
|
|
|
| private:
|
| // The object we need to inform when we get a notification. Weak. Owns us.
|
|
|