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

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

Issue 2169623002: [Material][Mac] Fixed Bookmark Items Highlight Issues (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: No highlight if it's disabled Created 4 years, 5 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 | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9a776df6af75289cc49cc6ad2971e37165a6d043..29601b0cf592b11b19fb6beb8ad0d711aca1d90a 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -1971,12 +1971,10 @@ CGFloat BookmarkRightMargin() {
[BookmarkButtonCell buttonCellWithText:text
image:image
menuController:contextMenuController_];
- if (ui::MaterialDesignController::IsModeMaterial()) {
+ if (ui::MaterialDesignController::IsModeMaterial())
[cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
- [cell setHighlightsBy:NSNoCellMask];
- } else {
+ else
[cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
- }
// Note: a quirk of setting a cell's text color is that it won't work
// until the cell is associated with a button, so we can't theme the cell yet.
@@ -2637,10 +2635,6 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
// Update |hoverButton_| so that it corresponds to the open folder.
hoverButton_.reset([sender retain]);
[folderTarget_ openBookmarkFolderFromButton:sender];
-
- const BookmarkButtonCell* cell = [sender cell];
- if ([cell tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback)
- [cell setHighlighted:YES];
} else {
// We're over a non-folder bookmark so close any old folders.
[folderController_ close];
@@ -2692,7 +2686,6 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
parentButton = [folderController_ parentButton];
}
[folderController_ close];
- [[parentButton cell] setHighlighted:NO];
[parentButton setNeedsDisplay:YES];
folderController_ = nil;
}
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698