chrome/browser/ui/views/toolbar/app_menu_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/app_menu_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/app_menu_button.cc

diff --git a/chrome/browser/ui/views/toolbar/app_menu_button.cc b/chrome/browser/ui/views/toolbar/app_menu_button.cc

index 71b043a4f2fab27038f2bc282e24308ac7446dd9..d3a6b9bfc7ac2ec6bcce2a5acd73263fb6872dc8 100644

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

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

@@ -43,8 +43,9 @@ AppMenuButton::AppMenuButton(ToolbarView* toolbar_view)

extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()),

margin_trailing_(0),

weak_factory_(this) {

- SetHasInkDrop(true);

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

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

+ SetHasInkDrop(true);

+ else

icon_painter_.reset(new AppMenuIconPainter(this));

}