Support for chrome.experimental.popup API in ExternalTabContainer views

chrome/browser/views/extensions/extension_popup.cc

 // Copyright (c) 2009 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/views/extensions/extension_popup.h"
 
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
 
 using views::Widget;
 
 // The minimum/maximum dimensions of the popup.
 // The minimum is just a little larger than the size of the button itself.
 // The maximum is an arbitrary number that should be smaller than most screens.
 const int ExtensionPopup::kMinWidth = 25;
 const int ExtensionPopup::kMinHeight = 25;
 const int ExtensionPopup::kMaxWidth = 800;
 const int ExtensionPopup::kMaxHeight = 600;
 
 ExtensionPopup::ExtensionPopup(ExtensionHost* host,
-                               Widget* frame,
+                               views::Widget* frame,
                                const gfx::Rect& relative_to,
                                BubbleBorder::ArrowLocation arrow_location,
                                bool activate_on_show)
     : BrowserBubble(host->view(),
                     frame,
                     gfx::Point()),
       relative_to_(relative_to),
       extension_host_(host),
       activate_on_show_(activate_on_show) {
   host->view()->SetContainer(this);
@@ skipping 31 matching lines @@
 void ExtensionPopup::Hide() {
   BrowserBubble::Hide();
   border_widget_->Hide();
 }
 
 void ExtensionPopup::Show(bool activate) {
   if (visible())
     return;
 
 #if defined(OS_WIN)
-  frame_->GetWindow()->DisableInactiveRendering();
+  if (frame_->GetWindow())
+    frame_->GetWindow()->DisableInactiveRendering();
 #endif
 
   ResizeToView();
 
   // Show the border first, then the popup overlaid on top.
   border_widget_->Show();
   BrowserBubble::Show(activate);
 }
 
 void ExtensionPopup::ResizeToView() {
@@ skipping 42 matching lines @@
   gfx::Size sz = view->GetPreferredSize();
   view->SetBounds(view->x(), view->y(),
       std::max(kMinWidth, std::min(kMaxWidth, sz.width())),
       std::max(kMinHeight, std::min(kMaxHeight, sz.height())));
 
   ResizeToView();
 }
 
 // static
 ExtensionPopup* ExtensionPopup::Show(
-    const GURL& url, Browser* browser,
+    const GURL& url,
+    Browser* browser,
+    Profile* profile,
+    gfx::NativeWindow frame_window,
     const gfx::Rect& relative_to,
     BubbleBorder::ArrowLocation arrow_location,
     bool activate_on_show) {
-  ExtensionProcessManager* manager =
-      browser->profile()->GetExtensionProcessManager();
+  DCHECK(profile);
+  DCHECK(frame_window);
+  ExtensionProcessManager* manager = profile->GetExtensionProcessManager();
   DCHECK(manager);
   if (!manager)
     return NULL;
 
+  // If no Browser instance was given, attempt to look up one matching the given
+  // profile.
+  if (!browser)
+    browser = BrowserList::FindBrowserWithProfile(profile);
+
+  Widget* frame_widget = Widget::GetWidgetFromNativeWindow(frame_window);
+  DCHECK(frame_widget);
+  if (!frame_widget)
+    return NULL;
+
   ExtensionHost* host = manager->CreatePopup(url, browser);
-  views::Widget* frame = BrowserView::GetBrowserViewForNativeWindow(
-      browser->window()->GetNativeHandle())->GetWidget();
-  ExtensionPopup* popup = new ExtensionPopup(host, frame, relative_to,
+  ExtensionPopup* popup = new ExtensionPopup(host, frame_widget, relative_to,
                                              arrow_location, activate_on_show);
 
   // If the host had somehow finished loading, then we'd miss the notification
   // and not show.  This seems to happen in single-process mode.
   if (host->did_stop_loading())
     popup->Show(activate_on_show);
 
   return popup;
 }