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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

Issue 1767273002: [MD] Fix some ink drop colors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 9 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/toolbar/toolbar_action_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
index 37f514008e26851b92a522a89aa171d9ee59ba42..38ee8f7031617288e34d5c38579da780da063eaa 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
@@ -110,18 +110,12 @@ bool ToolbarActionView::IsTriggerableEvent(const ui::Event& event) {
views::kMinimumMsBetweenButtonClicks;
}
-void ToolbarActionView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
- image()->SetPaintToLayer(true);
- image()->SetFillsBoundsOpaquely(false);
- views::MenuButton::AddInkDropLayer(ink_drop_layer);
-}
-
-void ToolbarActionView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
- views::MenuButton::RemoveInkDropLayer(ink_drop_layer);
- image()->SetPaintToLayer(false);
-}
-
SkColor ToolbarActionView::GetInkDropBaseColor() const {
+ if (delegate_->ShownInsideMenu()) {
+ return GetNativeTheme()->GetSystemColor(
+ ui::NativeTheme::kColorId_HoverMenuItemBackgroundColor);
+ }
+
return GetThemeProvider()->GetColor(
ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
}
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.h ('k') | chrome/browser/ui/views/toolbar/toolbar_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698