chrome/browser/extensions/page_action_controller.cc - Issue 454053005: Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

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/page_action_controller.cc

Issue 454053005: Consolidate ExtensionToolbarModel::Action and LocationBarController::Action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master for CQ Created 6 years, 4 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/page_action_controller.h ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/page_action_controller.cc

diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc

index 2d80da0ac573f03264b2604f650565aa3119fef5..56b1b3f951c66cd8b2bb5c48a1ed56a3087c3ca1 100644

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

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

@@ -37,7 +37,7 @@ ExtensionAction* PageActionController::GetActionForExtension(

return ExtensionActionManager::Get(GetProfile())->GetPageAction(*extension);

}

-LocationBarController::Action PageActionController::OnClicked(

+ExtensionAction::ShowAction PageActionController::OnClicked(

const Extension* extension) {

ExtensionAction* page_action =

ExtensionActionManager::Get(GetProfile())->GetPageAction(*extension);

@@ -48,7 +48,7 @@ LocationBarController::Action PageActionController::OnClicked(

active_tab_permission_granter()->GrantIfRequested(extension);

if (page_action->HasPopup(tab_id))

- return LocationBarController::ACTION_SHOW_POPUP;

+ return ExtensionAction::ACTION_SHOW_POPUP;

ExtensionActionAPI::PageActionExecuted(

web_contents_->GetBrowserContext(),

@@ -57,7 +57,7 @@ LocationBarController::Action PageActionController::OnClicked(

web_contents_->GetLastCommittedURL().spec(),

1 /* Button indication. We only ever pass left-click. */);

- return LocationBarController::ACTION_NONE;

+ return ExtensionAction::ACTION_NONE;

}

void PageActionController::OnNavigated() {