chrome/browser/ui/views/toolbar/toolbar_action_view.cc - Issue 1478303003: Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController.

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 1478303003: Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved some ripple controlling logic up the Button hierarchy. Created 5 years 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') | chrome/browser/ui/views/toolbar/toolbar_button.h » ('j') | chrome/browser/ui/views/toolbar/toolbar_button.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 524fb9525cedfeabefa855b52dad6f68772f4f7d..935cb50b16e344dd5e88d374b4a3a1b2d67f32f7 100644

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

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

@@ -225,8 +225,12 @@ gfx::Size ToolbarActionView::GetPreferredSize() const {

bool ToolbarActionView::OnMousePressed(const ui::MouseEvent& event) {

// views::MenuButton actions are only triggered by left mouse clicks.

- if (event.IsOnlyLeftMouseButton())

+ if (event.IsOnlyLeftMouseButton()) {

+ // TODO(bruthig): The ACTION_PENDING triggering logic should be in

+ // MenuButton::OnPressed() however there is a bug with the pressed state

+ // logic in MenuButton. See http://crbug.com/567252.

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

+ }

return MenuButton::OnMousePressed(event);

}