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

chrome/browser/extensions/extension_host_mac.mm

Index: chrome/browser/extensions/extension_host_mac.mm
===================================================================
--- chrome/browser/extensions/extension_host_mac.mm	(revision 110269)
+++ chrome/browser/extensions/extension_host_mac.mm	(working copy)
@@ -22,6 +22,33 @@
   }
 }
 
+RenderWidgetHostView* ExtensionHostMac::CreateNewWidgetInternal(
+    int route_id,
+    WebKit::WebPopupType popup_type) {
+  // A RenderWidgetHostViewMac has lifetime scoped to the view. We'll retain it
+  // to allow it to survive the trip without being hosed.
+  RenderWidgetHostView* widget_view =
+      ExtensionHost::CreateNewWidgetInternal(route_id, popup_type);
+  RenderWidgetHostViewMac* widget_view_mac =
+      static_cast<RenderWidgetHostViewMac*>(widget_view);
+  [widget_view_mac->native_view() retain];
+
+  return widget_view;
+}
+
+void ExtensionHostMac::ShowCreatedWidgetInternal(
+    RenderWidgetHostView* widget_host_view,
+    const gfx::Rect& initial_pos) {
+  ExtensionHost::ShowCreatedWidgetInternal(widget_host_view, initial_pos);
+
+  // A RenderWidgetHostViewMac has lifetime scoped to the view. Now that it's
+  // properly embedded (or purposefully ignored) we can release the reference we
+  // took in CreateNewWidgetInternal().
+  RenderWidgetHostViewMac* widget_view_mac =
+      static_cast<RenderWidgetHostViewMac*>(widget_host_view);
+  [widget_view_mac->native_view() release];
+}
+
 void ExtensionHostMac::UnhandledKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char ||
Property changes on: chrome/browser/extensions/extension_host_mac.mm
___________________________________________________________________
Added: svn:mergeinfo