Revert 110262 - Have ExtensionHost use TabContents instead of RenderViewHost. Try #2.

chrome/browser/ui/views/extensions/extension_view.cc

 // Copyright (c) 2011 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/ui/views/extensions/extension_view.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/browser/tab_contents/tab_contents.h"
-#include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/public/browser/content_browser_client.h"
 #include "views/widget/widget.h"
 
+#if defined(USE_AURA)
+#include "content/browser/renderer_host/render_widget_host_view_aura.h"
+#elif defined(TOUCH_UI)
+#include "chrome/browser/renderer_host/render_widget_host_view_views.h"
+#elif defined(TOOLKIT_USES_GTK)
+#include "content/browser/renderer_host/render_widget_host_view_gtk.h"
+#elif defined(OS_WIN)
+#include "content/browser/renderer_host/render_widget_host_view_win.h"
+#endif
+
 ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser)
     : host_(host),
       browser_(browser),
       initialized_(false),
       container_(NULL),
       is_clipped_(false) {
   host_->set_view(this);
 
   // This view needs to be focusable so it can act as the focused view for the
   // focus manager. This is required to have SkipDefaultKeyEventProcessing
@@ skipping 43 matching lines @@
         render_view_host()->view()->Show();
       else
         render_view_host()->view()->Hide();
     }
   }
 }
 
 void ExtensionView::CreateWidgetHostView() {
   DCHECK(!initialized_);
   initialized_ = true;
-  Attach(host_->host_contents()->view()->GetNativeView());
-  host_->CreateRenderViewSoon();
+  RenderWidgetHostView* view =
+      content::GetContentClient()->browser()->CreateViewForWidget(
+      render_view_host());
+
+  // TODO(mpcomplete): RWHV needs a cross-platform Init function.
+#if defined(USE_AURA)
+  static_cast<RenderWidgetHostViewAura*>(view)->InitAsChild();
+#elif defined(TOUCH_UI)
+  static_cast<RenderWidgetHostViewViews*>(view)->InitAsChild();
+#elif defined(TOOLKIT_USES_GTK)
+  static_cast<RenderWidgetHostViewGtk*>(view)->InitAsChild();
+#elif defined(OS_WIN)
+  // Create the HWND. Note:
+  // RenderWidgetHostHWND supports windowed plugins, but if we ever also
+  // wanted to support constrained windows with this, we would need an
+  // additional HWND to parent off of because windowed plugin HWNDs cannot
+  // exist in the same z-order as constrained windows.
+  RenderWidgetHostViewWin* view_win =
+      static_cast<RenderWidgetHostViewWin*>(view);
+  view_win->Create(GetWidget()->GetNativeView());
+  view_win->ShowWindow(SW_SHOW);
+#else
+  NOTIMPLEMENTED();
+#endif
+
+  Attach(view->GetNativeView());
+  host_->CreateRenderViewSoon(view);
   SetVisible(false);
 }
 
 void ExtensionView::ShowIfCompletelyLoaded() {
   if (IsVisible() || is_clipped_)
     return;
 
   // We wait to show the ExtensionView until it has loaded, and the view has
   // actually been created. These can happen in different orders.
   if (host_->did_stop_loading()) {
@@ skipping 55 matching lines @@
   return (e.key_code() == ui::VKEY_TAB || e.key_code() == ui::VKEY_BACK);
 }
 
 void ExtensionView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Propagate the new size to RenderWidgetHostView.
   // We can't send size zero because RenderWidget DCHECKs that.
   if (render_view_host()->view() && !bounds().IsEmpty())
     render_view_host()->view()->SetSize(size());
 }
 
+void ExtensionView::HandleMouseMove() {
+  if (container_)
+    container_->OnExtensionMouseMove(this);
+}
+
+void ExtensionView::HandleMouseLeave() {
+  if (container_)
+    container_->OnExtensionMouseLeave(this);
+}
+
 void ExtensionView::RenderViewCreated() {
   if (!pending_background_.empty() && render_view_host()->view()) {
     render_view_host()->view()->SetBackground(pending_background_);
     pending_background_.reset();
   }
 
   // Tell the renderer not to draw scroll bars in popups unless the
   // popups are at the maximum allowed size.
   gfx::Size largest_popup_size(ExtensionPopup::kMaxWidth,
                                ExtensionPopup::kMaxHeight);
   host_->DisableScrollbarsForSmallWindows(largest_popup_size);
 }