Keep reference view pressed while extension actions have a popup

ui/views/controls/menu/menu_controller.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_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 338 matching lines @@
 
   if (!blocking_run_) {
     if (!is_nested_drag) {
       // Start the timer to hide the menu. This is needed as we get no
       // notification when the drag has finished.
       StartCancelAllTimer();
     }
     return NULL;
   }
 
-  if (button)
+  scoped_ptr<MenuButton::PressedLock>& pressed_lock =
+      nested_menu ? nested_pressed_lock_ : pressed_lock_;
+  if (button) {
     menu_button_ = button;
+    pressed_lock.reset(new MenuButton::PressedLock(menu_button_));
+  }
 
   // Make sure Chrome doesn't attempt to shut down while the menu is showing.
   if (ViewsDelegate::views_delegate)
     ViewsDelegate::views_delegate->AddRef();
 
   // We need to turn on nestable tasks as in some situations (pressing alt-f for
   // one) the menus are run from a task. If we don't do this and are invoked
   // from a task none of the tasks we schedule are processed and the menu
   // appears totally broken.
   message_loop_depth_++;
@@ skipping 56 matching lines @@
       // before that happens otherwise the menus will stay on screen.
       CloseAllNestedMenus();
       SetSelection(NULL, SELECTION_UPDATE_IMMEDIATELY | SELECTION_EXIT);
 
       // Set exit_all_, which makes sure all nested loops exit immediately.
       if (exit_type_ != EXIT_DESTROYED)
         SetExitType(EXIT_ALL);
     }
   }
 
-  // If we stopped running because one of the menus was destroyed chances are
-  // the button was also destroyed.
-  if (exit_type_ != EXIT_DESTROYED && menu_button_) {
-    menu_button_->SetState(CustomButton::STATE_NORMAL);
-    menu_button_->SchedulePaint();
-  }
+  // Reset our pressed lock. The lock handles the case if the button was
+  // destroyed.
+  pressed_lock.reset();
+
   return result;
 }
 
 void MenuController::Cancel(ExitType type) {
   // If the menu has already been destroyed, no further cancellation is
   // needed.  We especially don't want to set the |exit_type_| to a lesser
   // value.
   if (exit_type_ == EXIT_DESTROYED || exit_type_ == type)
     return;
 
@@ skipping 763 matching lines @@
   delegate_->SiblingMenuCreated(alt_menu);
 
   if (!button) {
     // If the delegate returns a menu, they must also return a button.
     NOTREACHED();
     return false;
   }
 
   // There is a sibling menu, update the button state, hide the current menu
   // and show the new one.
-  menu_button_->SetState(CustomButton::STATE_NORMAL);
-  menu_button_->SchedulePaint();
   menu_button_ = button;
-  menu_button_->SetState(CustomButton::STATE_PRESSED);
-  menu_button_->SchedulePaint();
+  // We know that we need to reset the nested lock if it exists because we only
+  // support nesting menus that block runs (so we can't both have a nested menu
+  // *and* be updating the original).
+  scoped_ptr<MenuButton::PressedLock>& pressed_lock =
+      nested_pressed_lock_.get() ? nested_pressed_lock_ : pressed_lock_;
+  pressed_lock.reset(new MenuButton::PressedLock(menu_button_));
 
   // Need to reset capture when we show the menu again, otherwise we aren't
   // going to get any events.
   did_capture_ = false;
   gfx::Point screen_menu_loc;
   View::ConvertPointToScreen(button, &screen_menu_loc);
 
   // It is currently not possible to show a submenu recursively in a bubble.
   DCHECK(!MenuItemView::IsBubble(anchor));
   // Subtract 1 from the height to make the popup flush with the button border.
@@ skipping 1068 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
   return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views