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

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm

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

index db2d49510aeaba86983932978e50002d3491038a..ec7db250facfaf7a556269ea2963a0f92815a614 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm

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

#include <map>

#include "base/logging.h"

+#include "base/mac/sdk_forward_declarations.h"

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"

#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h"

#import "chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.h"

@@ -317,7 +318,7 @@ NSRect GetSheetParentBoundsForParentView(NSView* view) {

viewFrame.size.height += NSMinY(customSheetFrame) - NSMinY(sheetFrame);

}

- viewFrame.origin = [[parentView window] convertBaseToScreen:viewFrame.origin];

+ viewFrame = [[parentView window] convertRectToScreen:viewFrame];

return viewFrame;

}