chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm - Issue 1775223002: Prepare chrome/ for compilation with OS X 10.7 deployment target.

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/profiles/avatar_base_controller.mm

Issue 1775223002: Prepare chrome/ for compilation with OS X 10.7 deployment target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Compile errors. Fix null-window error. Created 4 years, 9 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/passwords/passwords_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/status_bubble_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm

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

index e3336946658c30c1d6e4932fda1e9af2804fd1a3..ef503f002245ebf0682c24d027402f3e92851b1e 100644

--- a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm

+++ b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm

@@ -24,6 +24,7 @@

#import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"

#include "components/signin/core/browser/signin_error_controller.h"

#include "components/signin/core/common/profile_management_switches.h"

+#include "ui/base/cocoa/cocoa_base_utils.h"

// Space between the avatar icon and the avatar menu bubble.

const CGFloat kMenuYOffsetAdjust = 1.0;

@@ -179,7 +180,7 @@ class ProfileAttributesUpdateObserver

NSPoint point = NSMakePoint(anchorX,

NSMaxY([anchor bounds]) + kMenuYOffsetAdjust);

point = [anchor convertPoint:point toView:nil];

- point = [[anchor window] convertBaseToScreen:point];

+ point = ui::ConvertPointFromWindowToScreen([anchor window], point);

// |menuController_| will automatically release itself on close.

profiles::BubbleViewMode viewMode;

« no previous file with comments | « chrome/browser/ui/cocoa/passwords/passwords_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/status_bubble_mac.mm » ('j') | no next file with comments »