chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 1241063003: Support Component Actions in the toolbar.

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 1241063003: Support Component Actions in the toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per isherman@'s comments. Created 5 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:

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 13c840e24fb3dad2ddf3f880b55e917e9489edaf..d1c766f4058940f011ad9a2ca68025efdc33a3b1 100644

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

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

@@ -563,7 +563,7 @@ void ToolbarActionsBarBridge::ShowExtensionMessageBubble(

scoped_ptr<ui::NinePartImageIds> highlight;

if (toolbarActionsBar_->is_highlighting()) {

if (toolbarActionsBar_->highlight_type() ==

- extensions::ExtensionToolbarModel::HIGHLIGHT_INFO)

+ ToolbarActionsModel::HIGHLIGHT_INFO)

highlight.reset(

new ui::NinePartImageIds(IMAGE_GRID(IDR_TOOLBAR_ACTION_HIGHLIGHT)));

else