chrome/browser/ui/cocoa/toolbar/toolbar_controller.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: chrome/browser/ui/cocoa/toolbar/toolbar_controller.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, 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: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

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

index a0122c82aa37ec0950454523bc60a48b22b41c6a..875137fe33e01b18d7c6e4e01353ed97f9e3d0a8 100644

--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

@@ -297,7 +297,7 @@ class NotificationBridge : public AppMenuIconController::Delegate {

// When linking and running on 10.10+, both -awakeFromNib and -viewDidLoad may

// be called, don't initialize twice.

if (locationBarView_) {

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

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

return;

}

« base/mac/mac_util_unittest.mm ('K') | « chrome/browser/ui/cocoa/tabs/tab_strip_view.mm ('k') | components/crash/content/app/breakpad_mac.mm » ('j') | no next file with comments »