Revert 158199 - extensions: Add ExtensionView interface.

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 130 matching lines @@
     UMA_HISTOGRAM_LONG_TIMES("Extensions.EventPageActiveTime",
                              since_created_.Elapsed());
   }
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
       content::Source<Profile>(profile_),
       content::Details<ExtensionHost>(this));
   ProcessCreationQueue::GetInstance()->Remove(this);
 }
 
-void ExtensionHost::SetExtensionView(ExtensionView* view) {
-  extension_view_.reset(view);
-}
-
-const ExtensionView* ExtensionHost::GetExtensionView() const {
-  return extension_view_.get();
-}
-
-ExtensionView* ExtensionHost::GetExtensionView() {
-  return extension_view_.get();
-}
-
 void ExtensionHost::CreateView(Browser* browser) {
-  extension_view_.reset(ExtensionView::Create(this, browser));
+#if defined(TOOLKIT_VIEWS)
+  view_.reset(new ExtensionViewViews(this, browser));
+  // We own |view_|, so don't auto delete when it's removed from the view
+  // hierarchy.
+  view_->set_owned_by_client();
+#elif defined(OS_MACOSX)
+  view_.reset(new ExtensionViewMac(this, browser));
+  view_->Init();
+#elif defined(TOOLKIT_GTK)
+  view_.reset(new ExtensionViewGtk(this, browser));
+  view_->Init();
+#else
+  // TODO(port)
+  NOTREACHED();
+#endif
 }
 
 WebContents* ExtensionHost::GetAssociatedWebContents() const {
   return associated_web_contents_;
 }
 
 void ExtensionHost::SetAssociatedWebContents(
     content::WebContents* web_contents) {
   associated_web_contents_ = web_contents;
   if (web_contents) {
@@ skipping 29 matching lines @@
 void ExtensionHost::CreateRenderViewNow() {
   LoadInitialURL();
   if (is_background_page()) {
     DCHECK(IsRenderViewLive());
     profile_->GetExtensionService()->DidCreateRenderViewForBackgroundPage(this);
   }
 }
 
 extensions::WindowController*
 ExtensionHost::GetExtensionWindowController() const {
-  return GetExtensionView() && GetExtensionView()->GetBrowser() ?
-      GetExtensionView()->GetBrowser()->extension_window_controller() : NULL;
+  return view() && view()->browser() ?
+      view()->browser()->extension_window_controller() : NULL;
 }
 
 const GURL& ExtensionHost::GetURL() const {
   return host_contents()->GetURL();
 }
 
 void ExtensionHost::LoadInitialURL() {
   if (!is_background_page() &&
       !profile_->GetExtensionService()->IsBackgroundPageReady(extension_)) {
     // Make sure the background page loads before any others.
@@ skipping 40 matching lines @@
       }
       break;
     default:
       NOTREACHED() << "Unexpected notification sent.";
       break;
   }
 }
 
 void ExtensionHost::ResizeDueToAutoResize(WebContents* source,
                                           const gfx::Size& new_size) {
-  if (GetExtensionView())
-    GetExtensionView()->ResizeDueToAutoResize(new_size);
+  if (view())
+    view()->ResizeDueToAutoResize(new_size);
 }
 
 void ExtensionHost::RenderViewGone(base::TerminationStatus status) {
   // During browser shutdown, we may use sudden termination on an extension
   // process, so it is expected to lose our connection to the render view.
   // Do nothing.
   if (browser_shutdown::GetShutdownType() != browser_shutdown::NOT_VALID)
     return;
 
   // In certain cases, multiple ExtensionHost objects may have pointed to
@@ skipping 25 matching lines @@
 }
 
 void ExtensionHost::DidStopLoading(content::RenderViewHost* render_view_host) {
   bool notify = !did_stop_loading_;
   did_stop_loading_ = true;
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP ||
       extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_DIALOG ||
       extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_INFOBAR ||
       extension_host_type_ == chrome::VIEW_TYPE_PANEL) {
 #if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
-    if (GetExtensionView())
-      GetExtensionView()->DidStopLoading();
+    if (view())
+      view()->DidStopLoading();
 #endif
   }
   if (notify) {
     if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) {
       if (extension_ && extension_->has_lazy_background_page()) {
         UMA_HISTOGRAM_TIMES("Extensions.EventPageLoadTime",
                             since_created_.Elapsed());
       } else {
         UMA_HISTOGRAM_TIMES("Extensions.BackgroundPageLoadTime",
                             since_created_.Elapsed());
@@ skipping 48 matching lines @@
       extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_INFOBAR ||
       extension_host_type_ == chrome::VIEW_TYPE_PANEL) {
     Close();
   }
 }
 
 void ExtensionHost::OnStartDownload(
     content::WebContents* source, content::DownloadItem* download) {
   // If |source| is in the context of a Browser, show the DownloadShelf on that
   // Browser.
-  if (!GetExtensionView() || !GetExtensionView()->GetBrowser())
+  if (!view() || !view()->browser())
     return;
-  static_cast<content::WebContentsDelegate*>(GetExtensionView()->GetBrowser())->
+  static_cast<content::WebContentsDelegate*>(view()->browser())->
     OnStartDownload(source, download);
 }
 
 void ExtensionHost::WebIntentDispatch(
     content::WebContents* web_contents,
     content::WebIntentsDispatcher* intents_dispatcher) {
 #if !defined(OS_ANDROID)
   scoped_ptr<content::WebIntentsDispatcher> dispatcher(intents_dispatcher);
 
-  Browser* browser = GetExtensionView() ? GetExtensionView()->GetBrowser()
+  Browser* browser = view() ? view()->browser()
       : browser::FindBrowserWithWebContents(web_contents);
 
-  // For background scripts/pages, there will be no GetExtensionView(). In this
-  // case, we want to treat the intent as a browser-initiated one and deliver it
-  // into the current browser. It probably came from a context menu click or
-  // similar.
+  // For background scripts/pages, there will be no view(). In this case, we
+  // want to treat the intent as a browser-initiated one and deliver it into the
+  // current browser. It probably came from a context menu click or similar.
   if (!browser)
     browser = web_intents::GetBrowserForBackgroundWebIntentDelivery(profile());
 
   if (browser) {
     static_cast<WebContentsDelegate*>(browser)->
         WebIntentDispatch(NULL, dispatcher.release());
   }
 #endif
 }
 
@@ skipping 17 matching lines @@
   switch (params.disposition) {
     case SINGLETON_TAB:
     case NEW_FOREGROUND_TAB:
     case NEW_BACKGROUND_TAB:
     case NEW_POPUP:
     case NEW_WINDOW:
     case SAVE_TO_DISK:
     case OFF_THE_RECORD: {
       // Only allow these from hosts that are bound to a browser (e.g. popups).
       // Otherwise they are not driven by a user gesture.
-      Browser* browser = GetExtensionView() ?
-          GetExtensionView()->GetBrowser() : NULL;
+      Browser* browser = view() ? view()->browser() : NULL;
       return browser ? browser->OpenURL(params) : NULL;
     }
     default:
       return NULL;
   }
 }
 
 bool ExtensionHost::PreHandleKeyboardEvent(WebContents* source,
                                            const NativeWebKeyboardEvent& event,
                                            bool* is_keyboard_shortcut) {
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP &&
       event.type == NativeWebKeyboardEvent::RawKeyDown &&
       event.windowsKeyCode == ui::VKEY_ESCAPE) {
     DCHECK(is_keyboard_shortcut != NULL);
     *is_keyboard_shortcut = true;
     return false;
   }
 
   // Handle higher priority browser shortcuts such as Ctrl-w.
-  Browser* browser = GetExtensionView() ?
-      GetExtensionView()->GetBrowser() : NULL;
+  Browser* browser = view() ? view()->browser() : NULL;
   if (browser)
     return browser->PreHandleKeyboardEvent(source, event, is_keyboard_shortcut);
 
   *is_keyboard_shortcut = false;
   return false;
 }
 
 void ExtensionHost::HandleKeyboardEvent(WebContents* source,
                                         const NativeWebKeyboardEvent& event) {
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP) {
@@ skipping 41 matching lines @@
 void ExtensionHost::OnDecrementLazyKeepaliveCount() {
   ExtensionProcessManager* pm =
       ExtensionSystem::Get(profile_)->process_manager();
   if (pm)
     pm->DecrementLazyKeepaliveCount(extension());
 }
 
 void ExtensionHost::UnhandledKeyboardEvent(
     WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
-  Browser* browser = GetExtensionView() ?
-      GetExtensionView()->GetBrowser() : NULL;
+  Browser* browser = view() ? view()->browser() : NULL;
   if (browser) {
     // Handle lower priority browser shortcuts such as Ctrl-f.
     return browser->HandleKeyboardEvent(source, event);
   } else {
 #if defined(TOOLKIT_VIEWS)
     // In case there's no Browser (e.g. for dialogs), pass it to
     // ExtensionViewViews to handle acceleratos. The view's FocusManager does
     // not know anything about Browser accelerators, but might know others such
     // as Ash's.
-    if (GetExtensionView())
-      GetExtensionView()->HandleKeyboardEvent(event);
+    if (view())
+      view()->HandleKeyboardEvent(event);
 #endif
   }
 }
 
 void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
   render_view_host_ = render_view_host;
 
-  if (GetExtensionView())
-    GetExtensionView()->RenderViewCreated();
+  if (view())
+    view()->RenderViewCreated();
 
   // If the host is bound to a window, then extract its id. Extensions hosted
   // in ExternalTabContainer objects may not have an associated window.
   extensions::WindowController* window = GetExtensionWindowController();
   if (window) {
     render_view_host->Send(new ExtensionMsg_UpdateBrowserWindowId(
         render_view_host->GetRoutingID(), window->GetWindowId()));
   }
 }
 
@@ skipping 50 matching lines @@
 }
 
 void ExtensionHost::RenderViewReady() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_HOST_CREATED,
       content::Source<Profile>(profile_),
       content::Details<ExtensionHost>(this));
 }
 
 }  // namespace extensions