chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_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_button_cell_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_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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_folder_button_cell_unittest.mm

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

index f9ec83bf38d26ed95e007d98e69aad1cb2f45e76..ac0356106fe5f525e85a8a08a70947b640dc2298 100644

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

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

@@ -5,7 +5,6 @@

#include "base/mac/scoped_nsobject.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"

#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/resources/grit/ui_resources.h"

@@ -58,14 +57,14 @@

NSRect rect = NSMakeRect(20, 20, 20, 20);

[cell setBookmarkCellText:@"" image:image];

- float icon_x_without_title = ([cell imageRectForBounds:rect]).origin.x;

+ float cell_x_without_title = ([cell imageRectForBounds:rect]).origin.x;

float cell_width_without_title = ([cell cellSize]).width;

[cell setBookmarkCellText:@"test" image:image];

- float icon_x_with_title = ([cell imageRectForBounds:rect]).origin.x;

+ float cell_x_with_title = ([cell imageRectForBounds:rect]).origin.x;

float cell_width_with_title = ([cell cellSize]).width;

- EXPECT_LT(icon_x_without_title, icon_x_with_title);

+ EXPECT_LT(cell_x_without_title, cell_x_with_title);

EXPECT_LT(cell_width_without_title, cell_width_with_title);

[folder_cell setBookmarkCellText:@"" image:image];