chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 1508853008: chrome: rename more wrench/Wrench occurrencies to appMenu/AppMenu

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 1508853008: chrome: rename more wrench/Wrench occurrencies to appMenu/AppMenu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix updateAppButtonSeverity and rewrap + rebase Created 5 years 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.h ('k') | chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.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 0ddd6aaad1f9d3c6328e07bc6df8e790b5eb38e6..f9a32af382e63e7caa593c2c3ec88581db173c1d 100644

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

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

@@ -161,7 +161,7 @@ const CGFloat kBrowserActionBubbleYOffset = 3.0;

// Returns the associated ToolbarController.

- (ToolbarController*)toolbarController;

-// Creates a message bubble anchored to the given |anchorAction|, or the wrench

+// Creates a message bubble anchored to the given |anchorAction|, or the app

// menu if no |anchorAction| is null.

- (ToolbarActionsBarBubbleMac*)createMessageBubble:

(scoped_ptr<ToolbarActionsBarBubbleDelegate>)delegate

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

NSView* referenceButton = button;

if ([button superview] != containerView_ || isOverflow_) {

referenceButton = toolbarActionsBar_->platform_settings().chevron_enabled ?

- chevronMenuButton_.get() : [[self toolbarController] wrenchButton];

+ chevronMenuButton_.get() : [[self toolbarController] appMenuButton];

bounds = [referenceButton bounds];

} else {

bounds = [button convertRect:[button frameAfterAnimation]

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

anchorToSelf:(BOOL)anchorToSelf {

DCHECK_GE([buttons_ count], 0u);

NSView* anchorView =

- anchorToSelf ? containerView_ : [[self toolbarController] wrenchButton];

+ anchorToSelf ? containerView_ : [[self toolbarController] appMenuButton];

NSPoint anchor = [self popupPointForView:anchorView

withBounds:[anchorView bounds]];