chrome/browser/extensions/extension_toolbar_model.cc - Issue 10700007: Page actions behave as disableable browser actions when script badges are enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_toolbar_model.cc

Issue 10700007: Page actions behave as disableable browser actions when script badges are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: estade + sky Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/extension_action/extension_actions_api.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_action_button.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 144b2b510f51723996e9e579d7d113c1b429930d..74c814180e359da8bc43f2d4b70b17efcdd4a817 100644

--- a/chrome/browser/extensions/extension_toolbar_model.cc

+++ b/chrome/browser/extensions/extension_toolbar_model.cc

@@ -97,10 +97,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);