extensions: Add ExtensionView interface.

chrome/browser/extensions/extension_host.h

Index: chrome/browser/extensions/extension_host.h
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index f905dd69f8aac899d327adbf3b686a2beb3c1ecd..9d536936203d4f6fe6f3e00ba6bbfbf9cf8ac3c6 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -19,17 +19,8 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 
-#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/ui/views/extensions/extension_view_views.h"
-#elif defined(OS_MACOSX)
-#include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
-#elif defined(TOOLKIT_GTK)
-#include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"
-#elif defined(OS_ANDROID)
-#include "chrome/browser/ui/android/extensions/extension_view_android.h"
-#endif
-
 class Browser;
+class ExtensionView;
 class PrefsTabHelper;
 
 namespace content {
@@ -54,39 +45,16 @@ class ExtensionHost : public content::WebContentsDelegate,
  public:
   class ProcessCreationQueue;
 
-#if defined(TOOLKIT_VIEWS)
-  typedef ExtensionViewViews PlatformExtensionView;
-#elif defined(OS_MACOSX)
-  typedef ExtensionViewMac PlatformExtensionView;
-#elif defined(TOOLKIT_GTK)
-  typedef ExtensionViewGtk PlatformExtensionView;
-#elif defined(OS_ANDROID)
-  // Android does not support extensions.
-  typedef ExtensionViewAndroid PlatformExtensionView;
-#endif
-
   ExtensionHost(const Extension* extension,
                 content::SiteInstance* site_instance,
-                const GURL& url, chrome::ViewType host_type);
+                const GURL& url,
+                chrome::ViewType host_type);
   virtual ~ExtensionHost();
 
-#if defined(TOOLKIT_VIEWS)
-  void set_view(PlatformExtensionView* view) { view_.reset(view); }
-#endif
+  void SetExtensionView(ExtensionView* view);

[Aaron Boodman, 2012/09/16 01:07:38]

Nit: These should be unix_hacker style, like the old ones were.

[tfarina, 2012/09/16 22:12:33]

That way I can forward declare ExtensionView instead of including its header
file unnecessarily.

 
-  const PlatformExtensionView* view() const {
-#if defined(OS_ANDROID)
-    NOTREACHED();
-#endif
-    return view_.get();
-  }
-
-  PlatformExtensionView* view() {
-#if defined(OS_ANDROID)
-    NOTREACHED();
-#endif
-    return view_.get();
-  }
+  const ExtensionView* GetExtensionView() const;
+  ExtensionView* GetExtensionView();
 
   // Create an ExtensionView and tie it to this host and |browser|.  Note NULL
   // is a valid argument for |browser|.  Extension views may be bound to
@@ -208,7 +176,7 @@ class ExtensionHost : public content::WebContentsDelegate,
 
   // Returns true if we're hosting a background page.
   // This isn't valid until CreateRenderView is called.
-  bool is_background_page() const { return !view(); }
+  bool is_background_page() const { return !GetExtensionView(); }
 
   // The extension that we're hosting in this view.
   const Extension* extension_;
@@ -220,7 +188,7 @@ class ExtensionHost : public content::WebContentsDelegate,
   Profile* profile_;
 
   // Optional view that shows the rendered content in the UI.
-  scoped_ptr<PlatformExtensionView> view_;
+  scoped_ptr<ExtensionView> extension_view_;
 
   // Used to create dialog boxes.
   // It must outlive host_contents_ as host_contents_ will access it