Fixes incorrect clearing of hot-tracked state when context menu is opened from a menu item

ui/views/controls/menu/menu_controller.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <stddef.h>
@@ skipping 217 matching lines @@
   // Direction for IncrementSelection and FindInitialSelectableMenuItem.
   enum SelectionIncrementDirectionType {
     // Navigate the menu up.
     INCREMENT_SELECTION_UP,
 
     // Navigate the menu down.
     INCREMENT_SELECTION_DOWN,
   };
 
   // Tracks selection information.
   struct State {

[sky, 2016/03/08 16:45:37]

This struct is meant to track state related to running of a nested menu.
hot_button should move here.

[varkha, 2016/03/23 21:16:01]

Done.

     State();
     State(const State& other);
     ~State();
 
     // The selected menu item.
     MenuItemView* item;
 
     // If item has a submenu this indicates if the submenu is showing.
     bool submenu_open;
 
@@ skipping 302 matching lines @@
   MenuItemView* ExitMenuRun();
 
   // Handles the mouse location event on the submenu |source|.
   void HandleMouseLocation(SubmenuView* source,
                            const gfx::Point& mouse_location);
 
   // Sets hot-tracked state to the first focusable descendant view of |item|.
   void SetInitialHotTrackedView(MenuItemView* item,
                                 SelectionIncrementDirectionType direction);
 
-  // Updates the current |hot_button_| and its hot tracked state.
-  void SetHotTrackedButton(CustomButton* hot_button);
-
   // The active instance.
   static MenuController* active_instance_;
 
   // If true, Run blocks. If false, Run doesn't block and this is used for
   // drag and drop. Note that the semantics for drag and drop are slightly
   // different: cancel timer is kicked off any time the drag moves outside the
   // menu, mouse events do nothing...
   bool blocking_run_;
 
   // If true, we're showing.
@@ skipping 78 matching lines @@
   // underway.
   scoped_ptr<MenuScrollTask> scroll_task_;
 
   // The lock to keep the menu button pressed while a menu is visible.
   scoped_ptr<MenuButton::PressedLock> pressed_lock_;
 
   // ViewStorage id used to store the view mouse drag events are forwarded to.
   // See UpdateActiveMouseView() for details.
   const int active_mouse_view_id_;
 
-  // Current hot tracked child button if any.
-  CustomButton* hot_button_;
-
   internal::MenuControllerDelegate* delegate_;
 
   // How deep we are in nested message loops. This should be at most 2 (when
   // showing a context menu from a menu).
   int message_loop_depth_;
 
   // The timestamp of the event which closed the menu - or 0 otherwise.
   base::TimeDelta closing_event_time_;
 
   // Time when the menu is first shown.
@@ skipping 28 matching lines @@
 #if defined(USE_AURA)
   scoped_ptr<MenuKeyEventHandler> key_event_handler_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_