experimental.popup support for tab-content-viewed extensions

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"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/jsmessage_box_handler.h"
-#include "chrome/browser/extensions/extension_popup_api.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/view_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "webkit/glue/context_menu.h"
 
 #if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/views/extensions/extension_popup.h"
 #include "views/widget/widget.h"
 #endif
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 
 // static
 bool ExtensionHost::enable_dom_automation_ = false;
 
 static const char* kToolstripTextColorSubstitution = "$TEXT_COLOR$";
@@ skipping 58 matching lines @@
 ////////////////
 // ExtensionHost
 
 ExtensionHost::ExtensionHost(Extension* extension, SiteInstance* site_instance,
                              const GURL& url, ViewType::Type host_type)
     : extension_(extension),
       profile_(site_instance->browsing_instance()->profile()),
       did_stop_loading_(false),
       document_element_available_(false),
       url_(url),
-#if defined(TOOLKIT_VIEWS)
-      child_popup_(NULL),
-#endif
       extension_host_type_(host_type) {
   render_view_host_ = new RenderViewHost(site_instance, this, MSG_ROUTING_NONE);
   render_view_host_->AllowBindings(BindingsPolicy::EXTENSION);
   if (enable_dom_automation_)
     render_view_host_->AllowBindings(BindingsPolicy::DOM_AUTOMATION);
-
-#if defined(TOOLKIT_VIEWS)
-  // Listen for view close requests, so that we can dismiss a hosted pop-up
-  // view, if necessary.
-  registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
-                 Source<Profile>(profile_));
-#endif
 }
 
 ExtensionHost::~ExtensionHost() {
-  DismissPopup();
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_HOST_DESTROYED,
       Source<Profile>(profile_),
       Details<ExtensionHost>(this));
   ProcessCreationQueue::get()->Remove(this);
   render_view_host_->Shutdown();  // deletes render_view_host
 }
 
 void ExtensionHost::CreateView(Browser* browser) {
 #if defined(TOOLKIT_VIEWS)
@@ skipping 69 matching lines @@
 }
 
 void ExtensionHost::Observe(NotificationType type,
                             const NotificationSource& source,
                             const NotificationDetails& details) {
   if (type == NotificationType::EXTENSION_BACKGROUND_PAGE_READY) {
     DCHECK(extension_->GetBackgroundPageReady());
     NavigateToURL(url_);
   } else if (type == NotificationType::BROWSER_THEME_CHANGED) {
     InsertThemeCSS();
-#if defined(TOOLKIT_VIEWS)
-  } else if (type == NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE) {
-    // If we aren't the host of the popup, then disregard the notification.
-    if (!child_popup_ ||
-        Details<ExtensionHost>(child_popup_->host()) != details)
-      return;
-
-    DismissPopup();
-#endif
   } else {
     NOTREACHED();
   }
 }
 
 void ExtensionHost::UpdatePreferredSize(const gfx::Size& new_size) {
   if (view_.get())
     view_->UpdatePreferredSize(new_size);
 }
 
@@ skipping 66 matching lines @@
   while (pos != std::string::npos) {
     css.replace(pos, 12, hex_color_string);
     pos = css.find(kToolstripTextColorSubstitution);
   }
 
   // As a toolstrip, inject our toolstrip CSS to make it easier for toolstrips
   // to blend in with the chrome UI.
   render_view_host()->InsertCSSInWebFrame(L"", css, "ToolstripThemeCSS");
 }
 
-void ExtensionHost::DismissPopup() {
-#if defined(TOOLKIT_VIEWS)
-  if (child_popup_) {
-    child_popup_->Hide();
-    child_popup_->DetachFromBrowser();
-    delete child_popup_;
-    child_popup_ = NULL;
-
-    PopupEventRouter::OnPopupClosed(GetBrowser()->profile(),
-                                    view()->render_view_host()->routing_id());
-  }
-#endif
-}
-
-#if defined(TOOLKIT_VIEWS)
-void ExtensionHost::BubbleBrowserWindowMoved(BrowserBubble* bubble) {
-  DismissPopup();
-}
-void ExtensionHost::BubbleBrowserWindowClosing(BrowserBubble* bubble) {
-  DismissPopup();
-}
-
-void ExtensionHost::BubbleGotFocus(BrowserBubble* bubble) {
-}
-
-void ExtensionHost::BubbleLostFocus(BrowserBubble* bubble) {
-  // TODO(twiz):  Dismiss the pop-up upon loss of focus of the bubble, but not
-  // if the focus is transitioning to the host which owns the popup!
-  // DismissPopup();
-}
-#endif  // defined(TOOLKIT_VIEWS)
-
 void ExtensionHost::DidStopLoading() {
   bool notify = !did_stop_loading_;
   did_stop_loading_ = true;
   if (extension_host_type_ == ViewType::EXTENSION_TOOLSTRIP ||
       extension_host_type_ == ViewType::EXTENSION_MOLE ||
       extension_host_type_ == ViewType::EXTENSION_POPUP) {
 #if defined(TOOLKIT_VIEWS)
     if (view_.get())
       view_->DidStopLoading();
 #endif
@@ skipping 250 matching lines @@
     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 {
     NOTREACHED();
   }
   return window_id;
 }