Fixed Back/Forward buttons to not hide ink drop when long press shows drop down menu.

ui/views/controls/button/custom_button_unittest.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/custom_button.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
@@ skipping 415 matching lines @@
   widget()->SetCapture(button());
   widget()->ReleaseCapture();
   SetDraggedView(nullptr);
   EXPECT_TRUE(ink_hidden);
   EXPECT_EQ(ui::MaterialDesignController::IsModeMaterial()
                 ? Button::ButtonState::STATE_NORMAL
                 : Button::ButtonState::STATE_PRESSED,
             button()->state());
 }
 
-TEST_F(CustomButtonTest, InkDropAfterShowingContextMenu) {
+TEST_F(CustomButtonTest, HideInkDropWhenShowingContextMenu) {
   TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
   CreateButtonWithInkDrop(make_scoped_ptr(ink_drop_delegate));
   TestContextMenuController context_menu_controller;
   button()->set_context_menu_controller(&context_menu_controller);
+  button()->set_hide_ink_drop_when_showing_context_menu(true);
 
   ink_drop_delegate->SetHovered(true);
   ink_drop_delegate->OnAction(InkDropState::ACTION_PENDING);
 
   button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
 
   EXPECT_FALSE(ink_drop_delegate->is_hovered());
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop_delegate->state());
 }
 
+TEST_F(CustomButtonTest, DontHideInkDropWhenShowingContextMenu) {
+  TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
+  CreateButtonWithInkDrop(make_scoped_ptr(ink_drop_delegate));
+  TestContextMenuController context_menu_controller;
+  button()->set_context_menu_controller(&context_menu_controller);
+  button()->set_hide_ink_drop_when_showing_context_menu(false);
+
+  ink_drop_delegate->SetHovered(true);
+  ink_drop_delegate->OnAction(InkDropState::ACTION_PENDING);
+
+  button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
+
+  EXPECT_TRUE(ink_drop_delegate->is_hovered());
+  EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop_delegate->state());
+}
+
 TEST_F(CustomButtonTest, InkDropAfterTryingToShowContextMenu) {
   TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
   CreateButtonWithInkDrop(make_scoped_ptr(ink_drop_delegate));
   button()->set_context_menu_controller(nullptr);
 
   ink_drop_delegate->SetHovered(true);
   ink_drop_delegate->OnAction(InkDropState::ACTION_PENDING);
 
   button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
 
   EXPECT_TRUE(ink_drop_delegate->is_hovered());
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop_delegate->state());
 }
 
 }  // namespace views