Moved AppMenu ACTIVATED/DEACTIVATED ink drop handling in to MenuButton.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 158 matching lines @@
   } else {
     view_controller_->ExecuteAction(true);
   }
 }
 
 void ToolbarActionView::OnMenuClosed() {
   menu_runner_.reset();
   menu_ = nullptr;
   view_controller_->OnContextMenuClosed();
   menu_adapter_.reset();
-  ink_drop_delegate()->OnAction(views::InkDropState::DEACTIVATED);
 }
 
 gfx::ImageSkia ToolbarActionView::GetIconForTest() {
   return GetImage(views::Button::STATE_NORMAL);
 }
 
 void ToolbarActionView::set_context_menu_callback_for_testing(
     base::Callback<void(ToolbarActionView*)>* callback) {
   context_menu_callback_for_test = callback;
 }
@@ skipping 101 matching lines @@
                   views::MenuRunner::CONTEXT_MENU | views::MenuRunner::ASYNC;
   if (delegate_->ShownInsideMenu())
     run_types |= views::MenuRunner::IS_NESTED;
 
   // RunMenuAt expects a nested menu to be parented by the same widget as the
   // already visible menu, in this case the Chrome menu.
   views::Widget* parent = delegate_->ShownInsideMenu() ?
       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.
   menu_adapter_.reset(new views::MenuModelAdapter(
       context_menu_model,
       base::Bind(&ToolbarActionView::OnMenuClosed, base::Unretained(this))));
   menu_ = menu_adapter_->CreateMenu();
   menu_runner_.reset(new views::MenuRunner(menu_, run_types));
 
   if (context_menu_callback_for_test)
@@ skipping 16 matching lines @@
     if (menu_controller->in_nested_run()) {
       // There is another menu showing. Close the outermost menu (since we are
       // shown in the same menu, we don't want to close the whole thing).
       menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
       return true;
     }
   }
 
   return false;
 }