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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 1752553002: [MD] Fix some ink drop colors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index dc33320374fec881d7b8c82cb4257712fee04167..fbe276202a5ce54b8c9ae9f291f50a3b0d0bb240 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -227,6 +227,11 @@ class BookmarkButtonBase : public views::LabelButton {
event_utils::IsPossibleDispositionEvent(e);
}
+ SkColor GetInkDropBaseColor() const override {
Evan Stade 2016/03/01 00:23:37 Moving this here makes it apply to the app shortcu
+ return GetThemeProvider()->GetColor(
+ ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
+ }
+
private:
scoped_ptr<gfx::SlideAnimation> show_animation_;
@@ -1696,7 +1701,6 @@ void BookmarkBarView::ConfigureButton(const BookmarkNode* node,
SkColor color =
GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT);
button->SetEnabledTextColors(color);
- button->set_ink_drop_base_color(color_utils::DeriveDefaultIconColor(color));
if (node->is_folder()) {
button->SetImage(views::Button::STATE_NORMAL,
chrome::GetBookmarkFolderIcon(color));
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/app_menu_button.h » ('j') | chrome/browser/ui/views/toolbar/app_menu_button.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698