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 2b3882fe5442a296c14a0f34f491b5af3971a678..10e12610232ca8dd96d5a1b49ee48bcc436ed118 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
@@ -242,7 +242,8 @@ class ExtensionServiceObserverBridge |
[button updateState]; |
} |
- virtual bool ShowExtensionActionPopup(const Extension* extension) OVERRIDE { |
+ virtual 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()) |
@@ -250,7 +251,7 @@ class ExtensionServiceObserverBridge |
BrowserActionButton* button = [owner_ buttonForExtension:extension]; |
return button && [owner_ browserActionClicked:button |
- shouldGrant:NO]; |
+ shouldGrant:grant_active_tab]; |
} |
virtual void ToolbarVisibleCountChanged() OVERRIDE { |
@@ -259,6 +260,10 @@ class ExtensionServiceObserverBridge |
virtual void ToolbarHighlightModeChanged(bool is_highlighting) OVERRIDE { |
} |
+ virtual Browser* GetBrowser() OVERRIDE { |
+ return browser_; |
+ } |
+ |
private: |
// The object we need to inform when we get a notification. Weak. Owns us. |
BrowserActionsController* owner_; |