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

ui/views/controls/menu/menu_controller.h

Index: ui/views/controls/menu/menu_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index 3741f762a975dab3f5a1b4662e7df6bca23f1e9a..9fd5184e20cff1aa051c10fa95b243ac0e3947d3 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -243,6 +243,9 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
     // 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;
 
@@ -659,9 +662,6 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
   // 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