Fixes alternating keyboard and mouse hot-tracking in menus

ui/views/controls/menu/menu_controller_unittest.cc

 // Copyright 2014 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/menu/menu_controller.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 389 matching lines @@
 
   void SetIsCombobox(bool is_combobox) {
     menu_controller_->set_is_combobox(is_combobox);
   }
 
   void SetSelectionOnPointerDown(SubmenuView* source,
                                  const ui::LocatedEvent* event) {
     menu_controller_->SetSelectionOnPointerDown(source, event);
   }
 
+  void ProcessMouseMoved(SubmenuView* source,
+                         const ui::MouseEvent& event) {
+    menu_controller_->OnMouseMoved(source, event);
+  }
+
   void RunMenu() {
 #if defined(USE_AURA)
     scoped_ptr<MenuKeyEventHandler> key_event_handler(new MenuKeyEventHandler);
 #endif
 
     menu_controller_->message_loop_depth_++;
     menu_controller_->RunMessageLoop(false);
     menu_controller_->message_loop_depth_--;
   }
 
@@ skipping 14 matching lines @@
     return menu_controller_delegate_.get();
   }
   MenuController* menu_controller() { return menu_controller_; }
   const MenuItemView* pending_state_item() const {
       return menu_controller_->pending_state_.item;
   }
   MenuController::ExitType menu_exit_type() const {
     return menu_controller_->exit_type_;
   }
 
+  void AddButtonMenuItems() {
+    menu_item()->SetBounds(0, 0, 200, 300);
+    MenuItemView* item_view =
+        menu_item()->AppendMenuItemWithLabel(5, base::ASCIIToUTF16("Five"));
+    for (int i = 0; i < 3; ++i) {
+      LabelButton* button =
+          new LabelButton(nullptr, base::ASCIIToUTF16("Label"));
+      button->SetFocusable(true);
+      item_view->AddChildView(button);
+    }
+    menu_item()->GetSubmenu()->ShowAt(owner(), menu_item()->bounds(), false);
+  }
+
  private:
   void DestroyMenuController() {
     if (!menu_controller_)
       return;
 
     if (!owner_->IsClosed())
       owner_->RemoveObserver(menu_controller_);
 
     menu_controller_->showing_ = false;
     menu_controller_->owner_ = nullptr;
@@ skipping 241 matching lines @@
   EXPECT_EQ(0, pending_state_item()->GetCommand());
 
   // Handle searching for 'f'; should find "Four".
   SelectByChar('f');
   EXPECT_EQ(4, pending_state_item()->GetCommand());
 
   // Clear references in menu controller to the menu item that is going away.
   ResetSelection();
 }
 
+TEST_F(MenuControllerTest, SelectChildButtonView) {
+  AddButtonMenuItems();
+  View* buttons_view = menu_item()->GetSubmenu()->child_at(4);
+  ASSERT_NE(nullptr, buttons_view);
+  CustomButton* button1 =
+      CustomButton::AsCustomButton(buttons_view->child_at(0));
+  ASSERT_NE(nullptr, button1);
+  CustomButton* button2 =
+      CustomButton::AsCustomButton(buttons_view->child_at(1));
+  ASSERT_NE(nullptr, button2);
+  CustomButton* button3 =
+      CustomButton::AsCustomButton(buttons_view->child_at(2));
+  ASSERT_NE(nullptr, button2);
+
+  // Handle searching for 'f'; should find "Four".
+  SelectByChar('f');
+  EXPECT_EQ(4, pending_state_item()->GetCommand());
+
+  EXPECT_FALSE(button1->IsHotTracked());
+  EXPECT_FALSE(button2->IsHotTracked());
+  EXPECT_FALSE(button3->IsHotTracked());
+
+  // Move selection to |button1|.
+  IncrementSelection();
+  EXPECT_EQ(5, pending_state_item()->GetCommand());
+  EXPECT_TRUE(button1->IsHotTracked());
+  EXPECT_FALSE(button2->IsHotTracked());
+  EXPECT_FALSE(button3->IsHotTracked());
+
+  // Move selection to |button2|.
+  IncrementSelection();
+  EXPECT_EQ(5, pending_state_item()->GetCommand());
+  EXPECT_FALSE(button1->IsHotTracked());
+  EXPECT_TRUE(button2->IsHotTracked());
+  EXPECT_FALSE(button3->IsHotTracked());
+
+  // Move selection to |button3|.
+  IncrementSelection();
+  EXPECT_EQ(5, pending_state_item()->GetCommand());
+  EXPECT_FALSE(button1->IsHotTracked());
+  EXPECT_FALSE(button2->IsHotTracked());
+  EXPECT_TRUE(button3->IsHotTracked());
+
+  // Move a mouse to hot track the |button1|.
+  gfx::Point location(button1->GetBoundsInScreen().CenterPoint());
+  ui::MouseEvent event(ui::ET_MOUSE_MOVED, location, location,
+                       ui::EventTimeForNow(), 0, 0);
+  SubmenuView* sub_menu = menu_item()->GetSubmenu();
+  ProcessMouseMoved(sub_menu, event);
+
+  // Incrementing selection should move hot tracking to the second button (next
+  // after the first button).
+  IncrementSelection();
+  EXPECT_EQ(5, pending_state_item()->GetCommand());
+  EXPECT_FALSE(button1->IsHotTracked());
+  EXPECT_TRUE(button2->IsHotTracked());
+  EXPECT_FALSE(button3->IsHotTracked());
+
+  // Increment selection twice to wrap around.
+  IncrementSelection();
+  IncrementSelection();
+  EXPECT_EQ(1, pending_state_item()->GetCommand());
+
+  // Clear references in menu controller to the menu item that is going away.
+  ResetSelection();
+}
+
+TEST_F(MenuControllerTest, DeleteChildButtonView) {
+  AddButtonMenuItems();
+
+  // Handle searching for 'f'; should find "Four".
+  SelectByChar('f');
+  EXPECT_EQ(4, pending_state_item()->GetCommand());
+
+  View* buttons_view = menu_item()->GetSubmenu()->child_at(4);
+  ASSERT_NE(nullptr, buttons_view);
+  CustomButton* button1 =
+      CustomButton::AsCustomButton(buttons_view->child_at(0));
+  ASSERT_NE(nullptr, button1);
+  CustomButton* button2 =
+      CustomButton::AsCustomButton(buttons_view->child_at(1));
+  ASSERT_NE(nullptr, button2);
+  CustomButton* button3 =
+      CustomButton::AsCustomButton(buttons_view->child_at(2));
+  ASSERT_NE(nullptr, button2);
+  EXPECT_FALSE(button1->IsHotTracked());
+  EXPECT_FALSE(button2->IsHotTracked());
+  EXPECT_FALSE(button3->IsHotTracked());
+
+  // Increment twice to move selection to |button2|.
+  IncrementSelection();
+  IncrementSelection();
+  EXPECT_EQ(5, pending_state_item()->GetCommand());
+  EXPECT_FALSE(button1->IsHotTracked());
+  EXPECT_TRUE(button2->IsHotTracked());
+  EXPECT_FALSE(button3->IsHotTracked());
+
+  // Delete |button2| while it is hot-tracked.
+  // This should update MenuController via ViewHierarchyChanged and reset
+  // |hot_button_|.
+  delete button2;
+
+  // Incrementing selection should now set hot-tracked item to |button1|.
+  // It should not crash.
+  IncrementSelection();
+  EXPECT_EQ(5, pending_state_item()->GetCommand());
+  EXPECT_TRUE(button1->IsHotTracked());
+  EXPECT_FALSE(button3->IsHotTracked());
+}
+
 // Tests that a menu opened asynchronously, will notify its
 // MenuControllerDelegate when Accept is called.
 TEST_F(MenuControllerTest, AsynchronousAccept) {
   MenuController* controller = menu_controller();
   controller->SetAsyncRun(true);
 
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
@@ skipping 276 matching lines @@
   // shutdown. This should not crash while attempting to repost the event.
   SetSelectionOnPointerDown(sub_menu, &event);
 
   // Close to remove observers before test TearDown
   sub_menu->Close();
   EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
 }
 
 }  // namespace test
 }  // namespace views