chrome/browser/ui/cocoa/browser_window_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/browser_window_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/browser/exclusive_access_controller_views.mm ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7fd16e93c31d4d25b9c46518aa707c0d47296ab6..c660dfd7a1823b82e1424a373f390127c8acc0d6 100644

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

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

@@ -1171,8 +1171,9 @@ void SetUpBrowserWindowCommandHandler(NSWindow* window) {

NSPoint tabOrigin = destinationFrame.origin;

tabOrigin = [[dragController tabStripView] convertPoint:tabOrigin

toView:nil];

- tabOrigin = [[dragController window] convertBaseToScreen:tabOrigin];

- tabOrigin = [[self window] convertScreenToBase:tabOrigin];

+ tabOrigin = ui::ConvertPointFromWindowToScreen([dragController window],

+ tabOrigin);

+ tabOrigin = ui::ConvertPointFromScreenToWindow([self window], tabOrigin);

tabOrigin = [[self tabStripView] convertPoint:tabOrigin fromView:nil];

destinationFrame.origin = tabOrigin;

@@ -1559,8 +1560,8 @@ void SetUpBrowserWindowCommandHandler(NSWindow* window) {

if (chrome::ToolkitViewsDialogsEnabled()) {

chrome::ShowBookmarkBubbleViewsAtPoint(

- gfx::ScreenPointFromNSPoint(

- [[self window] convertBaseToScreen:[self bookmarkBubblePoint]]),

+ gfx::ScreenPointFromNSPoint(ui::ConvertPointFromWindowToScreen(

+ [self window], [self bookmarkBubblePoint])),

[[self window] contentView], bookmarkBubbleObserver_.get(),

browser_.get(), url, alreadyMarked);

} else {