ui/views/cocoa/bridged_content_view.mm - Issue 2271653006: base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc.

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: ui/views/cocoa/bridged_content_view.mm

Issue 2271653006: base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 4 years, 4 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

« third_party/WebKit/Source/platform/mac/VersionUtilMac.h ('K') | « ui/native_theme/native_theme_mac_unittest.cc ('k') | ui/views/cocoa/bridged_native_widget.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/cocoa/bridged_content_view.mm

diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm

index 7cb9c0485819bed1b6fa7e1fc2ae517acf7d8359..1623e32b8ede82ff2b578ad5500010dca09f991c 100644

--- a/ui/views/cocoa/bridged_content_view.mm

+++ b/ui/views/cocoa/bridged_content_view.mm

@@ -345,7 +345,7 @@ ui::KeyEvent GetCharacterEventFromNSEvent(NSEvent* event) {

- (void)updateWindowMask {

DCHECK(![self inLiveResize]);

- DCHECK(base::mac::IsOSMavericks());

+ DCHECK(base::mac::IsOS10_9());

DCHECK(hostedView_);

views::Widget* widget = hostedView_->GetWidget();

@@ -606,7 +606,7 @@ ui::KeyEvent GetCharacterEventFromNSEvent(NSEvent* event) {

// We prevent updating the window mask and clipping the border around the

// view, during a live resize. Hence update the window mask and redraw the

// view after resize has completed.

- if (base::mac::IsOSMavericks()) {

+ if (base::mac::IsOS10_9()) {

[self updateWindowMask];

[self setNeedsDisplay:YES];

}

@@ -633,7 +633,7 @@ ui::KeyEvent GetCharacterEventFromNSEvent(NSEvent* event) {

// crbug.com/543671.

if (windowMask_ && ![self inLiveResize] &&

!IsRectInsidePath(dirtyRect, windowMask_)) {

- DCHECK(base::mac::IsOSMavericks());

+ DCHECK(base::mac::IsOS10_9());

gfx::ScopedNSGraphicsContextSaveGState state;

// The outer rectangular path corresponding to the window.