Support for chrome.experimental.popup API in ExternalTabContainer views

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2006-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/extensions/extension_host.h"
 
 #include <list>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 521 matching lines @@
 #endif
 }
 
 void ExtensionHost::HandleMouseLeave() {
 #if defined(OS_WIN)
   if (view_.get())
     view_->HandleMouseLeave();
 #endif
 }
 
-Browser* ExtensionHost::GetBrowser() {
+Browser* ExtensionHost::GetBrowser() const {
   if (view_.get())
     return view_->browser();
 
   Profile* profile = render_view_host()->process()->profile();
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
 
   // It's possible for a browser to exist, but to have never been active.
   // This can happen if you launch the browser on a machine without an active
   // desktop (a headless buildbot) or if you quickly give another app focus
   // at launch time.  This is easy to do with browser_tests.
@@ skipping 34 matching lines @@
   LOG(INFO) << "(RenderViewCreated) Resetting EFD to " << url_.spec() << " for "
       << extension_->name();
   extension_function_dispatcher_.reset(
       new ExtensionFunctionDispatcher(render_view_host, this, url_));
 
   render_view_host->Send(new ViewMsg_EnablePreferredSizeChangedMode(
       render_view_host->routing_id()));
 }
 
 int ExtensionHost::GetBrowserWindowID() const {
+  // Hosts not attached to any browser window have an id of -1.  This includes
+  // those mentioned below, and background pages.
   int window_id = -1;
   if (extension_host_type_ == ViewType::EXTENSION_TOOLSTRIP ||
       extension_host_type_ == ViewType::EXTENSION_MOLE ||
       extension_host_type_ == ViewType::EXTENSION_POPUP) {
-    window_id = ExtensionTabUtil::GetWindowId(
-        const_cast<ExtensionHost* >(this)->GetBrowser());
-  } else if (extension_host_type_ == ViewType::EXTENSION_BACKGROUND_PAGE) {
-    // Background page is not attached to any browser window, so pass -1.
-    window_id = -1;
-  } else {
+    // If the host is bound to a browser, then extract its window id.
+    // Extensions hosted in ExternalTabContainer objects may not have
+    // an associated browser.
+    Browser* browser = GetBrowser();
+    if (browser)
+      window_id = ExtensionTabUtil::GetWindowId(browser);
+  } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) {
     NOTREACHED();
   }
   return window_id;
 }