[Extensions Toolbar] Move some popup logic to be platform-agnostic

chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.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_platform_delegate_views.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/accelerator_priority.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ skipping 31 matching lines @@
       controller_->browser()->profile()->GetOriginalProfile());
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_COMMAND_ADDED,
                  notification_source);
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
                  notification_source);
 }
 
 ExtensionActionPlatformDelegateViews::~ExtensionActionPlatformDelegateViews() {
+  DCHECK(!popup_);  // We should never have a visible popup at shutdown.
   if (context_menu_owner == this)
-    context_menu_owner = NULL;
-  if (IsShowingPopup())
-    CloseOwnPopup();
+    context_menu_owner = nullptr;
   UnregisterCommand(false);
 }
 
 gfx::NativeView ExtensionActionPlatformDelegateViews::GetPopupNativeView() {
   return popup_ ? popup_->GetWidget()->GetNativeView() : nullptr;
 }
 
 bool ExtensionActionPlatformDelegateViews::IsMenuRunning() const {
   return menu_runner_.get() != NULL;
 }
@@ skipping 14 matching lines @@
         GetAcceleratorPriority(extension_command.accelerator(),
                                controller_->extension()),
         this);
   }
 }
 
 void ExtensionActionPlatformDelegateViews::OnDelegateSet() {
   GetDelegateViews()->GetAsView()->set_context_menu_controller(this);
 }
 
-bool ExtensionActionPlatformDelegateViews::IsShowingPopup() const {
-  return popup_ != nullptr;
-}
-
 void ExtensionActionPlatformDelegateViews::CloseActivePopup() {
-  GetDelegateViews()->HideActivePopup();
+  if (controller_->extension_action()->action_type() ==
+          ActionInfo::TYPE_BROWSER) {
+    BrowserView::GetBrowserViewForBrowser(controller_->browser())->toolbar()->
+        browser_actions()->HideActivePopup();
+  } else {
+    DCHECK_EQ(ActionInfo::TYPE_PAGE,
+              controller_->extension_action()->action_type());
+    // Page actions only know how to close their own popups.
+    controller_->HidePopup();
+  }
 }
 
 void ExtensionActionPlatformDelegateViews::CloseOwnPopup() {
-  // We should only be asked to close the popup if we're showing one.
-  DCHECK(popup_);
-  CleanupPopup(true);
+  // It's possible that the popup is already in the process of destroying.
+  if (popup_)
+    CleanupPopup(true);
 }
 
-bool ExtensionActionPlatformDelegateViews::ShowPopupWithUrl(
+extensions::ExtensionViewHost*
+ExtensionActionPlatformDelegateViews::ShowPopupWithUrl(
     ExtensionActionViewController::PopupShowAction show_action,
     const GURL& popup_url,
     bool grant_tab_permissions) {
   // TOP_RIGHT is correct for both RTL and LTR, because the views platform
   // performs the flipping in RTL cases.
   views::BubbleBorder::Arrow arrow = views::BubbleBorder::TOP_RIGHT;
 
   views::View* reference_view = GetDelegateViews()->GetReferenceViewForPopup();
 
   ExtensionPopup::ShowAction popup_show_action =
       show_action == ExtensionActionViewController::SHOW_POPUP ?
           ExtensionPopup::SHOW : ExtensionPopup::SHOW_AND_INSPECT;
   popup_ = ExtensionPopup::ShowPopup(popup_url,
                                      controller_->browser(),
                                      reference_view,
                                      arrow,
                                      popup_show_action);
   popup_->GetWidget()->AddObserver(this);
 
-  GetDelegateViews()->OnPopupShown(grant_tab_permissions);
-
-  return true;
+  return popup_->host();
 }
 
 void ExtensionActionPlatformDelegateViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == extensions::NOTIFICATION_EXTENSION_COMMAND_ADDED ||
          type == extensions::NOTIFICATION_EXTENSION_COMMAND_REMOVED);
   extensions::ExtensionCommandRemovedDetails* payload =
       content::Details<extensions::ExtensionCommandRemovedDetails>(details)
@@ skipping 74 matching lines @@
     ui::MenuSourceType source_type) {
   ui::MenuModel* context_menu_model = controller_->GetContextMenu();
   // It's possible the extension doesn't have a context menu.
   if (!context_menu_model)
     return;
 
   DCHECK(!context_menu_owner);
   context_menu_owner = this;
 
   // We shouldn't have both a popup and a context menu showing.
-  GetDelegateViews()->HideActivePopup();
+  CloseActivePopup();
 
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(GetDelegateViews()->GetAsView(),
                                     &screen_loc);
 
   int run_types =
       views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU;
   if (GetDelegateViews()->IsShownInMenu())
     run_types |= views::MenuRunner::IS_NESTED;
 
@@ skipping 56 matching lines @@
       menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
       return true;
     }
   }
 
   return false;
 }
 
 void ExtensionActionPlatformDelegateViews::CleanupPopup(bool close_widget) {
   DCHECK(popup_);
-  GetDelegateViews()->CleanupPopup();
   popup_->GetWidget()->RemoveObserver(this);
   if (close_widget)
     popup_->GetWidget()->Close();
-  popup_ = NULL;
+  popup_ = nullptr;
 }
 
 ToolbarActionViewDelegateViews*
 ExtensionActionPlatformDelegateViews::GetDelegateViews() const {
   return static_cast<ToolbarActionViewDelegateViews*>(
       controller_->view_delegate());
 }