Support for chrome.experimental.popup API in ExternalTabContainer views

chrome/browser/extensions/extension_dom_ui.cc

Index: chrome/browser/extensions/extension_dom_ui.cc
===================================================================
--- chrome/browser/extensions/extension_dom_ui.cc	(revision 34039)
+++ chrome/browser/extensions/extension_dom_ui.cc	(working copy)
@@ -63,10 +63,33 @@
                                                 has_callback);
 }
 
-Browser* ExtensionDOMUI::GetBrowser() {
-  return static_cast<Browser*>(tab_contents()->delegate());
+Browser* ExtensionDOMUI::GetBrowser() const {
+  TabContentsDelegate* tab_contents_delegate = tab_contents()->delegate();
+  if (tab_contents_delegate)
+    return tab_contents_delegate->GetBrowser();
+  return NULL;
 }
 
+Profile* ExtensionDOMUI::GetProfile() {
+  return DOMUI::GetProfile();
+}
+
+gfx::NativeWindow ExtensionDOMUI::GetFrameNativeWindow() {
+  gfx::NativeWindow native_window =
+      ExtensionFunctionDispatcher::Delegate::GetFrameNativeWindow();
+
+  // If there was no window associated with the function dispatcher delegate,
+  // then this DOMUI may be hosted in an ExternalTabContainer, and a framing
+  // window will be accessible through the tab_contents.
+  if (!native_window) {
+    TabContentsDelegate* tab_contents_delegate = tab_contents()->delegate();
+    if (tab_contents_delegate)
+      native_window = tab_contents_delegate->GetFrameNativeWindow();
+  }
+
+  return native_window;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // chrome:// URL overrides