chrome/browser/ui/views/toolbar/toolbar_action_view.cc - Issue 1778643002: Moved AppMenu ACTIVATED/DEACTIVATED ink drop handling in to MenuButton.

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_action_view.cc

Issue 1778643002: Moved AppMenu ACTIVATED/DEACTIVATED ink drop handling in to MenuButton. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added tests and addressed comments. Created 4 years, 9 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/app_menu_button.cc ('k') | ui/views/controls/button/menu_button.h » ('j') | ui/views/controls/button/menu_button_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

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

index 38ee8f7031617288e34d5c38579da780da063eaa..8abbc09f1296779eefdbbab1f729a5adfb804c7f 100644

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

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

@@ -176,7 +176,6 @@ void ToolbarActionView::OnMenuClosed() {

menu_ = nullptr;

view_controller_->OnContextMenuClosed();

menu_adapter_.reset();

- ink_drop_delegate()->OnAction(views::InkDropState::DEACTIVATED);

}

gfx::ImageSkia ToolbarActionView::GetIconForTest() {

@@ -298,7 +297,6 @@ void ToolbarActionView::DoShowContextMenu(

delegate_->GetOverflowReferenceView()->GetWidget() :

GetWidget();

- ink_drop_delegate()->OnAction(views::InkDropState::ACTIVATED);

// Unretained() is safe here as ToolbarActionView will always outlive the

// menu. Any action that would lead to the deletion of |this| first triggers

// the closing of the menu through lost capture.