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

ui/views/controls/menu/menu_item_view.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_item_view.h"
 
 #include <stddef.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
@@ skipping 94 matching lines @@
       has_mnemonics_(false),
       show_mnemonics_(false),
       has_icons_(false),
       icon_view_(NULL),
       top_margin_(-1),
       bottom_margin_(-1),
       left_icon_margin_(0),
       right_icon_margin_(0),
       requested_menu_position_(POSITION_BEST_FIT),
       actual_menu_position_(requested_menu_position_),
-      use_right_margin_(true) {
+      use_right_margin_(true),
+      hot_button_(nullptr) {
   // NOTE: don't check the delegate for NULL, UpdateMenuPartSizes() supplies a
   // NULL delegate.
   Init(NULL, 0, SUBMENU, delegate);
 }
 
 void MenuItemView::ChildPreferredSizeChanged(View* child) {
   invalidate_dimensions();
   PreferredSizeChanged();
 }
 
@@ skipping 233 matching lines @@
   invalidate_dimensions();  // Triggers preferred size recalculation.
 }
 
 void MenuItemView::SetMinorText(const base::string16& minor_text) {
   minor_text_ = minor_text;
   invalidate_dimensions();  // Triggers preferred size recalculation.
 }
 
 void MenuItemView::SetSelected(bool selected) {
   selected_ = selected;
+  if (!selected_)
+    SetHotTrackedButton(nullptr);
   SchedulePaint();
 }
 
 void MenuItemView::SetTooltip(const base::string16& tooltip, int item_id) {
   MenuItemView* item = GetMenuItemByID(item_id);
   DCHECK(item);
   item->tooltip_ = tooltip;
 }
 
 void MenuItemView::SetIcon(const gfx::ImageSkia& icon, int item_id) {
@@ skipping 179 matching lines @@
               (icon_area_width_ - size.width()) / 2;
       if (config.icons_in_label || type_ == CHECKBOX || type_ == RADIO)
         x = label_start_;
       int y =
           (height() + GetTopMargin() - GetBottomMargin() - size.height()) / 2;
       icon_view_->SetPosition(gfx::Point(x, y));
     }
   }
 }
 
+void MenuItemView::SetHotTrackedButton(CustomButton* hot_button) {
+  if (hot_button == hot_button_) {
+    // Hot-tracked state may change outside of the MenuController. Correct it.
+    if (hot_button && !hot_button->IsHotTracked())
+      hot_button->SetHotTracked(true);
+    return;
+  }
+  if (hot_button_)
+    hot_button_->SetHotTracked(false);
+  hot_button_ = hot_button;
+  if (hot_button)
+    hot_button->SetHotTracked(true);
+}
+
 void MenuItemView::SetMargins(int top_margin, int bottom_margin) {
   top_margin_ = top_margin;
   bottom_margin_ = bottom_margin;
 
   invalidate_dimensions();
 }
 
 MenuItemView::MenuItemView(MenuItemView* parent,
                            int command,
                            MenuItemView::Type type)
     : delegate_(NULL),
       controller_(NULL),
       canceled_(false),
       parent_menu_item_(parent),
       type_(type),
       selected_(false),
       command_(command),
       submenu_(NULL),
       has_mnemonics_(false),
       show_mnemonics_(false),
       has_icons_(false),
       icon_view_(NULL),
       top_margin_(-1),
       bottom_margin_(-1),
       left_icon_margin_(0),
       right_icon_margin_(0),
       requested_menu_position_(POSITION_BEST_FIT),
       actual_menu_position_(requested_menu_position_),
-      use_right_margin_(true) {
+      use_right_margin_(true),
+      hot_button_(nullptr) {
   Init(parent, command, type, NULL);
 }
 
 MenuItemView::~MenuItemView() {
   delete submenu_;
   STLDeleteElements(&removed_items_);
 }
 
 const char* MenuItemView::GetClassName() const {
   return kViewClassName;
 }
 
+void MenuItemView::ViewHierarchyChanged(
+    const ViewHierarchyChangedDetails& details) {
+  if (!details.is_add) {
+    // Update |hot_button_| if it gets removed while a menu is up.
+    if (details.child == hot_button_)
+      hot_button_ = nullptr;
+  }
+}
+
 // Calculates all sizes that we can from the OS.
 //
 // This is invoked prior to Running a menu.
 void MenuItemView::UpdateMenuPartSizes() {
   const MenuConfig& config = MenuConfig::instance();
 
   item_right_margin_ = config.label_to_arrow_padding + config.arrow_width +
                        config.arrow_to_edge_padding;
   icon_area_width_ = config.check_width;
   if (has_icons_)
@@ skipping 462 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views