chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm - 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/ui/cocoa/location_bar/page_action_decoration.mm

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/ui/cocoa/extensions/browser_actions_controller.mm ('k') | chrome/browser/ui/views/extensions/extension_action_view_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm

index 3c4db07d53acdf7b5b76aac3e6ecbd215f1e00a6..6fbfa8854cab1c89fee6697d23b5a1d246000e43 100644

--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm

@@ -107,20 +107,12 @@ bool PageActionDecoration::ActivatePageAction(NSRect frame) {

location_bar_controller();

switch (controller->OnClicked(page_action_)) {

- case LocationBarController::ACTION_NONE:

+ case ExtensionAction::ACTION_NONE:

break;

- case LocationBarController::ACTION_SHOW_POPUP:

+ case ExtensionAction::ACTION_SHOW_POPUP:

ShowPopup(frame, page_action_->GetPopupUrl(current_tab_id_));

break;

- case LocationBarController::ACTION_SHOW_CONTEXT_MENU:

- // We are never passing OnClicked a right-click button, so assume that

- // we're never going to be asked to show a context menu.

- // TODO(kalman): if this changes, update this class to pass the real

- // mouse button through to the LocationBarController.

- NOTREACHED();

- break;

}

return true;