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

ui/views/controls/menu/menu_item_view.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_ITEM_VIEW_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 21 matching lines @@
 namespace views {
 
 namespace internal {
 class MenuRunnerImpl;
 }
 
 namespace test {
 class TestMenuItemViewShown;
 }
 
+class CustomButton;
 class MenuController;
 class MenuDelegate;
 class SubmenuView;
 
 // MenuItemView --------------------------------------------------------------
 
 // MenuItemView represents a single menu item with a label and optional icon.
 // Each MenuItemView may also contain a submenu, which in turn may contain
 // any number of child MenuItemViews.
 //
@@ skipping 253 matching lines @@
   // Returns the descendant with the specified command.
   MenuItemView* GetMenuItemByID(int id);
 
   // Invoke if you remove/add children to the menu while it's showing. This
   // recalculates the bounds.
   void ChildrenChanged();
 
   // Sizes any child views.
   void Layout() override;
 
+  CustomButton* hot_button() const { return hot_button_; }
+
+  // Updates the current |hot_button_| and its hot tracked state.
+  void SetHotTrackedButton(CustomButton* hot_button);
+
   // Returns true if the menu has mnemonics. This only useful on the root menu
   // item.
   bool has_mnemonics() const { return has_mnemonics_; }
 
   // Set top and bottom margins in pixels.  If no margin is set or a
   // negative margin is specified then MenuConfig values are used.
   void SetMargins(int top_margin, int bottom_margin);
 
   // Suppress the right margin if this is set to false.
   void set_use_right_margin(bool use_right_margin) {
     use_right_margin_ = use_right_margin;
   }
 
  protected:
   // Creates a MenuItemView. This is used by the various AddXXX methods.
   MenuItemView(MenuItemView* parent, int command, Type type);
 
   // MenuRunner owns MenuItemView and should be the only one deleting it.
   ~MenuItemView() override;
 
   void ChildPreferredSizeChanged(View* child) override;
 
+  // View:
   const char* GetClassName() const override;
+  void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) override;
 
   // Returns the preferred size (and padding) of any children.
   virtual gfx::Size GetChildPreferredSize() const;
 
   // Returns the various margins.
   int GetTopMargin() const;
   int GetBottomMargin() const;
 
  private:
   friend class internal::MenuRunnerImpl;  // For access to ~MenuItemView.
@@ skipping 165 matching lines @@
   // |menu_position_| is the requested position with respect to the bounds.
   // |actual_menu_position_| is used by the controller to cache the
   // position of the menu being shown.
   MenuPosition requested_menu_position_;
   MenuPosition actual_menu_position_;
 
   // If set to false, the right margin will be removed for menu lines
   // containing other elements.
   bool use_right_margin_;
 
+  // Current hot tracked child button if any.
+  CustomButton* hot_button_;
+
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_