chrome/browser/ui/cocoa/global_error_bubble_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/global_error_bubble_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/global_error_bubble_controller.h ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/global_error_bubble_controller.mm

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

index 951c6431ffde2b4972598ee338c58dc2ee7a1079..14c05cba4fce69cc36d27122073a1d12459f30b0 100644

--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm

@@ -52,15 +52,15 @@ class Bridge : public GlobalErrorBubbleViewBase {

NSWindow* parentWindow = browser->window()->GetNativeWindow();

BrowserWindowController* bwc = [BrowserWindowController

browserWindowControllerForWindow:parentWindow];

- NSView* wrenchButton = [[bwc toolbarController] wrenchButton];

+ NSView* appMenuButton = [[bwc toolbarController] appMenuButton];

NSPoint offset = NSMakePoint(

- NSMidX([wrenchButton bounds]),

+ NSMidX([appMenuButton bounds]),

app_menu_controller::kAppMenuBubblePointOffsetY);

// The bubble will be automatically deleted when the window is closed.

GlobalErrorBubbleController* bubble = [[GlobalErrorBubbleController alloc]

initWithWindowNibPath:@"GlobalErrorBubble"

- relativeToView:wrenchButton

+ relativeToView:appMenuButton

offset:offset];

bubble->error_ = error;

bubble->bridge_.reset(new GlobalErrorBubbleControllerInternal::Bridge(