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;
 
+    // Current hot tracked child button if any.
+    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 396 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_;

[sky, 2016/03/23 21:42:40]

I recommend keeping the member around and only adding to state when changing
menu_stack_. I say that as the hot button should be updated immediately, where
as pending_state_ is meant to be the state that will change after a delay.

[varkha, 2016/03/24 18:36:18]

Done.

-
   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_