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 417 matching lines @@
       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_) {
+  // the button was also destroyed. If there is a menu visible on the button, it
+  // will clean itself up.
+  if (exit_type_ != EXIT_DESTROYED &&
+      menu_button_ &&
+      !menu_button_->menu_visible())
     menu_button_->SetState(CustomButton::STATE_NORMAL);
-    menu_button_->SchedulePaint();
-  }
   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 1856 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
   return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views