chrome/browser/ui/views/toolbar/toolbar_button.cc - Issue 2067013002: Removed InkDropFactory.

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 2067013002: Removed InkDropFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed views:: -> ui:: compile error. Created 4 years, 6 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:

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 82a4f391e2685c6854abd75b387b9c39adc7ceed..b49a042b1b3535fd5b8fc6a9d26cbba021d65ef4 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc

@@ -37,11 +37,12 @@ ToolbarButton::ToolbarButton(Profile* profile,

menu_showing_(false),

y_position_on_lbuttondown_(0),

show_menu_factory_(this) {

- SetHasInkDrop(true);

set_has_ink_drop_action_on_click(true);

set_context_menu_controller(this);

- if (ui::MaterialDesignController::IsModeMaterial())

+ if (ui::MaterialDesignController::IsModeMaterial()) {

+ SetHasInkDrop(true);

SetFocusPainter(nullptr);

+ }

}

ToolbarButton::~ToolbarButton() {}