chrome/browser/extensions/api/extension_action/extension_action_api.cc - Issue 1708033002: [Extensions] Don't allow chrome.browserAction.openPopup on popups

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/api/extension_action/extension_action_api.cc

Issue 1708033002: [Extensions] Don't allow chrome.browserAction.openPopup on popups (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2623

Patch Set: Compile fix Created 4 years, 10 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/browser_action_apitest.cc ('k') | chrome/test/data/extensions/api_test/browser_action/open_popup_on_reply/background.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_action_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

index babf2494a3d458c128051c59adff61c48db6a570..dd7dd202b715f72e031d98379bddadbd83f86f45 100644

--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

@@ -232,8 +232,13 @@ bool ExtensionActionAPI::ShowExtensionActionPopup(

return browser->window()->GetLocationBar()->ShowPageActionPopup(

extension, grant_active_tab_permissions);

}

- return browser->window()->GetToolbarActionsBar()->ShowToolbarActionPopup(

- extension->id(), grant_active_tab_permissions);

+ ToolbarActionsBar* toolbar_actions_bar =

+ browser->window()->GetToolbarActionsBar();

+ // ToolbarActionsBar could be null if, e.g., this is a popup window with no

+ // toolbar.

+ return toolbar_actions_bar &&

+ toolbar_actions_bar->ShowToolbarActionPopup(

+ extension->id(), grant_active_tab_permissions);

}

bool ExtensionActionAPI::ExtensionWantsToRun(