Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3284)

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: Removed explicit deletes of the ink drop delegates. 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
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 e11905b73c53ffe2e8459523ec144913f83f1fbe..c50f98824f06b73cbfa78953c82c213c5a085d51 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
@@ -70,6 +70,7 @@ ToolbarActionView::ToolbarActionView(
ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),
weak_factory_(this) {
set_ink_drop_delegate(ink_drop_delegate_.get());
+ set_has_ink_drop_action_on_click(true);
set_id(VIEW_ID_BROWSER_ACTION);
view_controller_->SetDelegate(this);
SetHorizontalAlignment(gfx::ALIGN_CENTER);
@@ -108,8 +109,6 @@ ToolbarActionView::~ToolbarActionView() {
if (context_menu_owner == this)
context_menu_owner = nullptr;
view_controller_->SetDelegate(nullptr);
- ink_drop_delegate_.reset();
- set_ink_drop_delegate(nullptr);
}
void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) {
@@ -226,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);
}

Powered by Google App Engine
This is Rietveld 408576698