Have ExtensionHost use TabContents instead of RenderViewHost. Try #2. The first

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(OS_WIN)
-#include "content/browser/renderer_host/render_widget_host_view_win.h"
-#elif defined(TOUCH_UI) || defined(USE_AURA)
-#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"
-#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;
-  RenderWidgetHostView* view =
-      content::GetContentClient()->browser()->CreateViewForWidget(
-      render_view_host());
+  host_->CreateRenderViewSoon();
+  SetVisible(false);
 
-  // TODO(mpcomplete): RWHV needs a cross-platform Init function.
-#if defined(USE_AURA)
-  // TODO(beng): should be same as TOUCH_UI
-  NOTIMPLEMENTED();
-#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);
-  HWND hwnd = view_win->Create(GetWidget()->GetNativeView());
-  view_win->ShowWindow(SW_SHOW);
-  Attach(hwnd);
-#elif defined(TOUCH_UI)
-  RenderWidgetHostViewViews* view_views =
-      static_cast<RenderWidgetHostViewViews*>(view);
-  view_views->InitAsChild();
-  AttachToView(view_views);
-#elif defined(TOOLKIT_USES_GTK)
-  RenderWidgetHostViewGtk* view_gtk =
-      static_cast<RenderWidgetHostViewGtk*>(view);
-  view_gtk->InitAsChild();
-  Attach(view_gtk->GetNativeView());
-#else
-  NOTIMPLEMENTED();
-#endif
-
-  host_->CreateRenderViewSoon(view);
-  SetVisible(false);
+  Attach(host_->host_contents()->view()->GetNativeView());
 }
 
 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()) {
     SetVisible(true);
@@ skipping 20 matching lines @@
 
 void ExtensionView::UpdatePreferredSize(const gfx::Size& new_size) {
   // Don't actually do anything with this information until we have been shown.
   // Size changes will not be honored by lower layers while we are hidden.
   if (!IsVisible()) {
     pending_preferred_size_ = new_size;
     return;
   }
 
   gfx::Size preferred_size = GetPreferredSize();
-  if (new_size != preferred_size)
+  if (new_size != preferred_size) {
     SetPreferredSize(new_size);
+    host_->host_contents()->view()->SizeContents(new_size);
+  }
 }
 
 void ExtensionView::ViewHierarchyChanged(bool is_add,
                                          views::View *parent,
                                          views::View *child) {
   NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
   if (is_add && GetWidget() && !initialized_)
     CreateWidgetHostView();
 }
 
@@ skipping 12 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);
 }