chrome/browser/ui/views/toolbar/toolbar_button.cc - Issue 2001843002: Use ink drop hover for focus states on toolbar buttons and location

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: format 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') | ui/views/animation/ink_drop_host_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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() {}