Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: ui/views/cocoa/bridged_content_view.mm

Issue 2288003002: Delete IsAtLeastOS10_9() and IsAtMostOS10_9() (Closed)
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
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 1623e32b8ede82ff2b578ad5500010dca09f991c..c9b4cdbd7b33ac150a480eebc2b210cbb669d944 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::IsOS10_9());
+ DCHECK(!base::mac::IsAtLeastOS10_10());
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::IsOS10_9()) {
+ if (!base::mac::IsAtLeastOS10_10()) {
[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::IsOS10_9());
+ DCHECK(!base::mac::IsAtLeastOS10_10());
gfx::ScopedNSGraphicsContextSaveGState state;
// The outer rectangular path corresponding to the window.

Powered by Google App Engine
This is Rietveld 408576698