Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2779)

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 1988223002: [Mac][Material Design] Bring bookmark hover background up to spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test. 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
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 e6ed06649fe9b529707424274fd62649872f9845..a6d4315eea50f6bf8a351410a3fe59cdddb55647 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -602,11 +602,7 @@ CGFloat BookmarkRightMargin() {
// The state of our morph (if any); 1 is total bubble, 0 is the regular bar.
CGFloat morph = [self detachedMorphProgress];
CGFloat padding = 0;
- if (ui::MaterialDesignController::IsModeMaterial()) {
- padding = bookmarks::kMaterialNTPBookmarkBarPadding;
- } else {
- padding = bookmarks::kNTPBookmarkBarPadding;
- }
+ padding = bookmarks::kNTPBookmarkBarPadding;
buttonViewFrame =
NSInsetRect(buttonViewFrame, morph * padding, morph * padding);
@@ -1984,11 +1980,7 @@ CGFloat BookmarkRightMargin() {
xOffset:(int*)xOffset {
DCHECK(xOffset);
NSRect bounds = [buttonView_ bounds];
- if (ui::MaterialDesignController::IsModeMaterial()) {
- bounds.size.height = bookmarks::kMaterialBookmarkButtonHeight;
- } else {
- bounds.size.height = bookmarks::kBookmarkButtonHeight;
- }
+ bounds.size.height = bookmarks::kBookmarkButtonHeight;
NSRect frame = NSInsetRect(bounds,
bookmarks::BookmarkHorizontalPadding(),
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698