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

Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

index 1c8550ea3842443d9824089765186e039f4b4156..504809d7da9ce759ea7a5c38cd4726c7d3d268f2 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

@@ -746,9 +746,9 @@ class ExtensionServiceObserverBridge

GURL popupUrl;

switch (toolbarModel_->ExecuteBrowserAction(extension, browser_, &popupUrl,

shouldGrant)) {

- case extensions::ExtensionToolbarModel::ACTION_NONE:

+ case ExtensionAction::ACTION_NONE:

break;

- case extensions::ExtensionToolbarModel::ACTION_SHOW_POPUP: {

+ case ExtensionAction::ACTION_SHOW_POPUP: {

NSPoint arrowPoint = [self popupPointForBrowserAction:extension];

[ExtensionPopupController showURL:popupUrl

inBrowser:browser_