Keep reference view pressed while extension actions have a popup

chrome/browser/ui/views/extensions/extension_action_view_controller.cc

 // Copyright 2014 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 "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
@@ skipping 54 matching lines @@
 void ExtensionActionViewController::ExecuteActionByUser() {
   ExecuteAction(ExtensionPopup::SHOW, true);
 }
 
 bool ExtensionActionViewController::ExecuteAction(
     ExtensionPopup::ShowAction show_action, bool grant_tab_permissions) {
   if (extensions::ExtensionActionAPI::Get(browser_->profile())->
           ExecuteExtensionAction(extension_, browser_, grant_tab_permissions) ==
       ExtensionAction::ACTION_SHOW_POPUP) {
     GURL popup_url = extension_action_->GetPopupUrl(GetCurrentTabId());
-    if (delegate_->GetPreferredPopupViewController()->ShowPopupWithUrl(
-            show_action, popup_url)) {
-      delegate_->OnPopupShown(grant_tab_permissions);
-      return true;
-    }
+    return delegate_->GetPreferredPopupViewController()->ShowPopupWithUrl(
+        show_action, popup_url, grant_tab_permissions);
   }
   return false;
 }
 
 void ExtensionActionViewController::HidePopup() {
   if (popup_)
     CleanupPopup(true);
 }
 
 gfx::Image ExtensionActionViewController::GetIcon(int tab_id) {
@@ skipping 106 matching lines @@
     ui::MenuSourceType source_type) {
   if (!extension_->ShowConfigureContextMenus())
     return;
 
   DCHECK(!context_menu_owner);
   context_menu_owner = this;
 
   // We shouldn't have both a popup and a context menu showing.
   delegate_->HideActivePopup();
 
-  delegate_->OnWillShowContextMenus();
-
   // Reconstructs the menu every time because the menu's contents are dynamic.
   scoped_refptr<ExtensionContextMenuModel> context_menu_model(
       new ExtensionContextMenuModel(extension_, browser_, this));
 
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(delegate_->GetAsView(), &screen_loc);
 
   int run_types = views::MenuRunner::HAS_MNEMONICS |
                   views::MenuRunner::CONTEXT_MENU;
   if (delegate_->IsShownInMenu())
     run_types |= views::MenuRunner::IS_NESTED;
 
   views::Widget* parent = delegate_->GetParentForContextMenu();
 
   menu_runner_.reset(
       new views::MenuRunner(context_menu_model.get(), run_types));
 
   if (menu_runner_->RunMenuAt(
           parent,
-          NULL,
+          delegate_->GetContextMenuButton(),
           gfx::Rect(screen_loc, delegate_->GetAsView()->size()),
           views::MENU_ANCHOR_TOPLEFT,
           source_type) == views::MenuRunner::MENU_DELETED) {
     return;
   }
 
   context_menu_owner = NULL;
   menu_runner_.reset();
-  delegate_->OnContextMenuDone();
 
   // If another extension action wants to show its context menu, allow it to.
   if (!followup_context_menu_task_.is_null()) {
     base::Closure task = followup_context_menu_task_;
     followup_context_menu_task_ = base::Closure();
     task.Run();
   }
 }
 
 bool ExtensionActionViewController::ShowPopupWithUrl(
-    ExtensionPopup::ShowAction show_action, const GURL& popup_url) {
+    ExtensionPopup::ShowAction show_action,
+    const GURL& popup_url,
+    bool grant_tab_permissions) {
   // If we're already showing the popup for this browser action, just hide it
   // and return.
   bool already_showing = popup_ != NULL;
 
   // Always hide the current popup, even if it's not the same.
   // Only one popup should be visible at a time.
   delegate_->HideActivePopup();
 
   // Similarly, don't allow a context menu and a popup to be showing
   // simultaneously.
   CloseActiveMenuIfNeeded();
 
   if (already_showing)
     return false;
 
   views::BubbleBorder::Arrow arrow = base::i18n::IsRTL() ?
       views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
 
   views::View* reference_view = delegate_->GetReferenceViewForPopup();
 
   popup_ = ExtensionPopup::ShowPopup(
                popup_url, browser_, reference_view, arrow, show_action);
   popup_->GetWidget()->AddObserver(this);
 
+  delegate_->OnPopupShown(grant_tab_permissions);
+
   return true;
 }
 
 bool ExtensionActionViewController::GetExtensionCommand(
     extensions::Command* command) {
   DCHECK(command);
   CommandService* command_service = CommandService::Get(browser_->profile());
   if (extension_action_->action_type() == ActionInfo::TYPE_PAGE) {
     return command_service->GetPageActionCommand(
         extension_->id(), CommandService::ACTIVE_ONLY, command, NULL);
@@ skipping 24 matching lines @@
 }
 
 void ExtensionActionViewController::CleanupPopup(bool close_widget) {
   DCHECK(popup_);
   delegate_->CleanupPopup();
   popup_->GetWidget()->RemoveObserver(this);
   if (close_widget)
     popup_->GetWidget()->Close();
   popup_ = NULL;
 }