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

ui/views/controls/button/custom_button_unittest.cc

Index: ui/views/controls/button/custom_button_unittest.cc
diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc
index 081ed54e22dbf7daffbe5811aefd167c60a12106..bd34cb036c4c7de984c876ca260d40969e4e43e5 100644
--- a/ui/views/controls/button/custom_button_unittest.cc
+++ b/ui/views/controls/button/custom_button_unittest.cc
@@ -433,11 +433,12 @@ TEST_F(CustomButtonTest, CaptureLossHidesInkDrop) {
             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);
@@ -448,6 +449,22 @@ TEST_F(CustomButtonTest, InkDropAfterShowingContextMenu) {
   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));