chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.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_unittest.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/bookmarks/bookmark_bar_controller.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller.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_unittest.mm

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

index 9ba3378bc83cb2760e15a7bb1722fc311d3f6d64..fb15b7d8da825175893eba9eb534daf5c1c608b9 100644

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

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

@@ -1640,10 +1640,10 @@ TEST_F(BookmarkBarControllerTest, DISABLED_LastBookmarkResizeBehavior) {

153.0, 143.0, 142.0 };

CGFloat* view_widths = NULL;

bool is_mode_material = ui::MaterialDesignController::IsModeMaterial();

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

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

view_widths = is_mode_material ? material_view_widths_el_capitan

: view_widths_el_capitan;

- } else if (base::mac::IsOSYosemite()) {

+ } else if (base::mac::IsOS10_10()) {

view_widths = is_mode_material ? material_view_widths_yosemite

: view_widths_yosemite;

} else {