chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.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/omnibox/omnibox_popup_view_mac.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/location_bar/zoom_decoration.mm ('k') | chrome/browser/ui/cocoa/one_click_signin_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

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

index b4249c1dcce4309ea4bbfb0cb92077242916c7f5..f8a10b8c84872db71eae7828941e7c1fbcde2f7b 100644

--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

@@ -202,9 +202,11 @@ void OmniboxPopupViewMac::PositionPopup(const CGFloat matrixHeight) {

popup_frame.size.height += [OmniboxPopupTopSeparatorView preferredHeight];

popup_frame.size.height += [OmniboxPopupBottomSeparatorView preferredHeight];

popup_frame.origin.y -= NSHeight(popup_frame);

// Shift to screen coordinates.

- popup_frame.origin =

- [[controller window] convertBaseToScreen:popup_frame.origin];

+ if ([controller window]) {

+ popup_frame = [[controller window] convertRectToScreen:popup_frame];

+ }

// Top separator.

NSRect top_separator_frame = NSZeroRect;