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

chrome/browser/ui/cocoa/extensions/extension_view_mac.h

Index: chrome/browser/ui/cocoa/extensions/extension_view_mac.h
===================================================================
--- chrome/browser/ui/cocoa/extensions/extension_view_mac.h	(revision 110269)
+++ chrome/browser/ui/cocoa/extensions/extension_view_mac.h	(working copy)
@@ -14,6 +14,7 @@
 class Browser;
 class ExtensionHost;
 class RenderViewHost;
+class RenderWidgetHostViewMac;
 class SkBitmap;
 
 // This class represents extension views. An extension view internally contains
@@ -34,10 +35,6 @@
   // Returns the browser the extension belongs to.
   Browser* browser() const { return browser_; }
 
-  // Method for the ExtensionHost to notify us that the extension page is
-  // loaded.
-  void DidStopLoading();
-
   // Sets the extensions's background image.
   void SetBackground(const SkBitmap& background);
 
@@ -66,21 +63,18 @@
 
   void CreateWidgetHostView();
 
-  // We wait to show the ExtensionView until several things have loaded.
-  void ShowIfCompletelyLoaded();
-
   Browser* browser_;  // weak
 
   ExtensionHost* extension_host_;  // weak
 
+  // Created by us, but owned by its |native_view()|. We |release| the
+  // rwhv's native view in our destructor, effectively freeing this.
+  RenderWidgetHostViewMac* render_widget_host_view_;
+
   // The background the view should have once it is initialized. This is set
   // when the view has a custom background, but hasn't been initialized yet.
   SkBitmap pending_background_;
 
-  // What we should set the preferred width to once the ExtensionView has
-  // loaded.
-  gfx::Size pending_preferred_size_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionViewMac);
 };
 
Property changes on: chrome/browser/ui/cocoa/extensions/extension_view_mac.h
___________________________________________________________________
Added: svn:mergeinfo