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 225 matching lines @@
 
   // Tracks selection information.
   struct State {
     State();
     State(const State& other);
     ~State();
 
     // The selected menu item.
     MenuItemView* item;
 
+    // Used to capture a hot tracked child button when a nested menu is opened
+    // and to restore the hot tracked state when exiting a nested menu.
+    CustomButton* hot_button;
+
     // If item has a submenu this indicates if the submenu is showing.
     bool submenu_open;
 
     // Bounds passed to the run menu. Used for positioning the first menu.
     gfx::Rect initial_bounds;
 
     // Position of the initial menu.
     MenuAnchorPosition anchor;
 
     // The direction child menus have opened in.
@@ skipping 415 matching lines @@
   // The timestamp of the event which closed the menu - or 0 otherwise.
   base::TimeDelta closing_event_time_;
 
   // Time when the menu is first shown.
   base::TimeTicks menu_start_time_;
 
   // If a mouse press triggered this menu, this will have its location (in
   // screen coordinates). Otherwise this will be (0, 0).
   gfx::Point menu_start_mouse_press_loc_;
 
-  // Controls behviour differences between an asynchronous run, and other types
+  // Controls behaviour differences between an asynchronous run, and other types
   // of run (blocking, drag and drop).
   bool async_run_;
 
   // Controls behavior differences between a combobox and other types of menu
   // (like a context menu).
   bool is_combobox_;
 
   // Set to true if the menu item was selected by touch.
   bool item_selected_by_touch_;
 
@@ skipping 11 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_