| Index: ui/views/controls/menu/menu_controller.cc
|
| diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
|
| index 7526317312ca296b279ea4ceb0a7f860f52fd70f..3bbb0457f661c1ca2b67e4c921fa578b9df7a5d8 100644
|
| --- a/ui/views/controls/menu/menu_controller.cc
|
| +++ b/ui/views/controls/menu/menu_controller.cc
|
| @@ -2638,8 +2638,12 @@ void MenuController::SetInitialHotTrackedView(
|
| }
|
|
|
| void MenuController::SetHotTrackedButton(CustomButton* hot_button) {
|
| - if (hot_button == 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;
|
|
|