chrome/browser/extensions/extension_toolbar_model.cc - Issue 10911300: Move ExtensionAction from common/ to browser/.

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 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: proof of concept Created 8 years, 3 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:

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 13c5e3ff144d83b52f9269326fb36711811a0260..531cd1de282749b58cd6bc9c755a295b16ed9f7b 100644

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

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

@@ -115,7 +115,8 @@ ExtensionToolbarModel::Action ExtensionToolbarModel::ExecuteBrowserAction(

if (tab_id < 0)

return ACTION_NONE;

- ExtensionAction* browser_action = extension->browser_action();

+ ExtensionAction* browser_action = GetBrowserAction(tab_contents->profile(),

+ *extension);

// For browser actions, visibility == enabledness.

if (!browser_action->GetIsVisible(tab_id))