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

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

Issue 2001843002: Use ink drop hover for focus states on toolbar buttons and location (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: layout 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/views/toolbar/toolbar_button.h ('k') | ui/views/animation/button_ink_drop_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index d557a2866a3afa2884f0de3c15753e04d40ad52c..741c8c3a7c00f9408f72cc1aaee127c197c602d6 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -37,11 +37,13 @@ ToolbarButton::ToolbarButton(Profile* profile,
model_(model),
menu_showing_(false),
y_position_on_lbuttondown_(0),
- ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),
show_menu_factory_(this) {
- set_ink_drop_delegate(ink_drop_delegate_.get());
+ set_ink_drop_delegate(
+ base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));
set_has_ink_drop_action_on_click(true);
set_context_menu_controller(this);
+ if (ui::MaterialDesignController::IsModeMaterial())
+ SetFocusPainter(nullptr);
}
ToolbarButton::~ToolbarButton() {}
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_button.h ('k') | ui/views/animation/button_ink_drop_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698