chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_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

« base/mac/mac_util_unittest.mm ('K') | « chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

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

index 44b2343b9a3b99e0b0d00757ddc1e76fa8bac6fb..698f631a70e3dc890a45dd26f56e0cda9fb8d061 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

@@ -468,7 +468,7 @@ CGFloat BookmarkRightMargin() {

if (bridge_) {

// When running on 10.10, expect both -awakeFromNib and -viewDidLoad to be

// called, but only initialize once.

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

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

return;

}