| Index: chrome/browser/extensions/extension_toolbar_model.cc
|
| diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
|
| index f8289acce74241d6756862e1d60617d87e109b1b..e2ffc6413bbc0ffda2413474850083472eb77703 100644
|
| --- a/chrome/browser/extensions/extension_toolbar_model.cc
|
| +++ b/chrome/browser/extensions/extension_toolbar_model.cc
|
| @@ -96,10 +96,15 @@ ExtensionToolbarModel::Action ExtensionToolbarModel::ExecuteBrowserAction(
|
| if (tab_id < 0)
|
| return ACTION_NONE;
|
|
|
| + ExtensionAction* browser_action = extension->browser_action();
|
| +
|
| + // For browser actions, visibility == enabledness.
|
| + if (!browser_action->GetIsVisible(tab_id))
|
| + return ACTION_NONE;
|
| +
|
| tab_contents->extension_tab_helper()->active_tab_permission_manager()->
|
| GrantIfRequested(extension);
|
|
|
| - ExtensionAction* browser_action = extension->browser_action();
|
| if (browser_action->HasPopup(tab_id)) {
|
| if (popup_url_out)
|
| *popup_url_out = browser_action->GetPopupUrl(tab_id);
|
|
|