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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_layout.mm

Issue 2271653006: base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Add SDK guards to blink, simplify how IsOS* are defined Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/browser_window_layout.h" 5 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 // Computes the height of the backing bar for the views in the omnibox area in 54 // Computes the height of the backing bar for the views in the omnibox area in
55 // fullscreen mode. 55 // fullscreen mode.
56 - (CGFloat)fullscreenBackingBarHeight; 56 - (CGFloat)fullscreenBackingBarHeight;
57 57
58 @end 58 @end
59 59
60 @implementation BrowserWindowLayout 60 @implementation BrowserWindowLayout
61 61
62 - (instancetype)init { 62 - (instancetype)init {
63 if ((self = [super init])) { 63 if ((self = [super init])) {
64 parameters_.isOSYosemiteOrLater = base::mac::IsOSYosemiteOrLater(); 64 parameters_.isOSYosemiteOrLater = base::mac::IsAtLeastOS10_10();
65 } 65 }
66 return self; 66 return self;
67 } 67 }
68 68
69 - (chrome::LayoutOutput)computeLayout { 69 - (chrome::LayoutOutput)computeLayout {
70 memset(&output_, 0, sizeof(chrome::LayoutOutput)); 70 memset(&output_, 0, sizeof(chrome::LayoutOutput));
71 71
72 [self computeFullscreenYOffset]; 72 [self computeFullscreenYOffset];
73 [self computeTabStripLayout]; 73 [self computeTabStripLayout];
74 [self computeContentViewLayout]; 74 [self computeContentViewLayout];
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 395
396 @end 396 @end
397 397
398 @implementation BrowserWindowLayout (ExposedForTesting) 398 @implementation BrowserWindowLayout (ExposedForTesting)
399 399
400 - (void)setOSYosemiteOrLater:(BOOL)osYosemiteOrLater { 400 - (void)setOSYosemiteOrLater:(BOOL)osYosemiteOrLater {
401 parameters_.isOSYosemiteOrLater = osYosemiteOrLater; 401 parameters_.isOSYosemiteOrLater = osYosemiteOrLater;
402 } 402 }
403 403
404 @end 404 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698