chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm - Issue 2200303004: [Mac][Material Design] Adjust bookmark spacing and folder menu drawing.

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 2200303004: [Mac][Material Design] Adjust bookmark spacing and folder menu drawing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests, changes for icon-only items. 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h » ('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 ff6ba4b43f9382b4fc790246c3eea4528e3776e8..d2bd16cb07ecef2140df6ac4a76da46605da0265 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

@@ -23,6 +23,7 @@

#include "testing/platform_test.h"

#include "ui/base/cocoa/animation_utils.h"

#include "ui/base/cocoa/cocoa_base_utils.h"

+#include "ui/base/material_design/material_design_controller.h"

using base::ASCIIToUTF16;

using bookmarks::BookmarkModel;

@@ -1318,7 +1319,11 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {

EXPECT_CGFLOAT_EQ(scrollerWidth, buttonWidth);

CGFloat visibleWidth = NSWidth(visibleFrame);

EXPECT_CGFLOAT_EQ(visibleWidth - widthDelta, buttonWidth);

- EXPECT_LT(scrollerWidth, NSWidth([folderView frame]));

+ if (ui::MaterialDesignController::IsModeMaterial()) {

+ EXPECT_CGFLOAT_EQ(scrollerWidth, NSWidth([folderView frame]));

+ } else {

+ EXPECT_LT(scrollerWidth, NSWidth([folderView frame]));

+ }

// Add a wider bookmark and make sure the button widths match.

int reallyWideButtonNumber = folder->child_count();