chrome/browser/ui/views/toolbar/app_menu_button.cc - Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

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 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed merge conflict in custom_button.cc 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/location_bar/content_setting_image_view.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_action_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 482d37056e808c68bc0fdf805f16326e3ab17186..9f40555102f1d9e45255cb64cd534db003deea82 100644

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

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

@@ -26,7 +26,6 @@

#include "ui/gfx/paint_vector_icon.h"

#include "ui/gfx/vector_icons_public.h"

#include "ui/keyboard/keyboard_controller.h"

-#include "ui/views/animation/button_ink_drop_delegate.h"

#include "ui/views/controls/button/label_button_border.h"

#include "ui/views/controls/menu/menu_listener.h"

#include "ui/views/metrics.h"

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

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

margin_trailing_(0),

weak_factory_(this) {

- set_ink_drop_delegate(

- base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));

+ SetHasInkDrop(true);

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

icon_painter_.reset(new AppMenuIconPainter(this));

}