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

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

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

index 0b1c319b96a903e7351f522033c92e897e752e74..4dd768595bd8661538b811ed36880ccf4af656ca 100644

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

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

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

#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

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

#include "grit/theme_resources.h"

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

#include "ui/base/cocoa/nsgraphics_context_additions.h"

#import "ui/base/cocoa/nsview_additions.h"

#include "ui/base/material_design/material_design_controller.h"

@@ -167,7 +168,7 @@ const CGFloat kWindowGradientHeight = 24.0;

// The tab strip view covers our window buttons. So we add hit testing here

// to find them properly and return them to the accessibility system.

- (id)accessibilityHitTest:(NSPoint)point {

- NSPoint windowPoint = [self convertScreenToBase:point];

+ NSPoint windowPoint = ui::ConvertPointFromScreenToWindow(self, point);

NSControl* controls[] = { closeButton_, zoomButton_, miniaturizeButton_ };

id value = nil;

for (size_t i = 0; i < sizeof(controls) / sizeof(controls[0]); ++i) {