chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm - Issue 1986963004: Revert of [Mac][Material Design] Update bookmarks bar to Material Design.

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_folder_controller_unittest.mm

Issue 1986963004: Revert of [Mac][Material Design] Update bookmarks bar to Material Design. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a074dc20bd6c36fbf210c556f1fe7bfc1a6f88ca..7aed14e69b6fadb050bb4a5df13bbd7a1a20f9e1 100644

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

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

@@ -621,7 +621,7 @@

// make sure the top has not moved.

oldTop = newTop;

const CGFloat scrollOneBookmark = bookmarks::kBookmarkFolderButtonHeight +

- bookmarks::BookmarkVerticalPadding();

+ bookmarks::kBookmarkVerticalPadding;

NSUInteger buttonCounter = 0;

NSUInteger extraButtonLimit = 3;

while (![bbfc canScrollDown] || extraButtonLimit > 0) {

@@ -773,7 +773,7 @@

BookmarkButton* draggedButton = [bar_ buttonWithTitleEqualTo:@"1b"];

ASSERT_TRUE(draggedButton);

CGFloat horizontalShift =

- NSWidth([draggedButton frame]) + bookmarks::BookmarkHorizontalPadding();

+ NSWidth([draggedButton frame]) + bookmarks::kBookmarkHorizontalPadding;

BookmarkButton* targetButton =

[folderController buttonWithTitleEqualTo:@"2f1b"];

ASSERT_TRUE(targetButton);

@@ -1285,7 +1285,7 @@

NSWindow* folderWindow = [folderController window];

EXPECT_TRUE(folderWindow);

CGFloat expectedHeight = (CGFloat)bookmarks::kBookmarkFolderButtonHeight +

- (2*bookmarks::BookmarkVerticalPadding());

+ (2*bookmarks::kBookmarkVerticalPadding);

NSRect windowFrame = [folderWindow frame];

CGFloat windowHeight = NSHeight(windowFrame);

EXPECT_CGFLOAT_EQ(expectedHeight, windowHeight);

@@ -1593,7 +1593,7 @@

EXPECT_TRUE(folder);

// Test a series of points starting at the top of the folder.

- const CGFloat yOffset = 0.5 * bookmarks::BookmarkVerticalPadding();

+ const CGFloat yOffset = 0.5 * bookmarks::kBookmarkVerticalPadding;

BookmarkButton* targetButton = [folder buttonWithTitleEqualTo:@"2f1b"];

ASSERT_TRUE(targetButton);

NSPoint targetPoint = [targetButton top];