Pull shell window stuff out of ExtensionHost and put in ShellWindow

chrome/browser/ui/extensions/shell_window.h

Index: chrome/browser/ui/extensions/shell_window.h
diff --git a/chrome/browser/ui/extensions/shell_window.h b/chrome/browser/ui/extensions/shell_window.h
index 2790b74d1d823f51a22b29135e1fec4eacf0a4e2..dd0419e1eda7fd3102329a81a58bc2fa677525f7 100644
--- a/chrome/browser/ui/extensions/shell_window.h
+++ b/chrome/browser/ui/extensions/shell_window.h
@@ -7,14 +7,13 @@
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/extensions/platform_app_host.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/ui/base_window.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Extension;
-class ExtensionHost;
 class ExtensionWindowController;
 class GURL;
 class Profile;
@@ -47,15 +46,17 @@ class ShellWindow : public content::NotificationObserver,
                        const content::NotificationDetails& details) OVERRIDE;
 
  protected:
-  explicit ShellWindow(ExtensionHost* host_);
+  ShellWindow(PlatformAppHost* host_, const Extension* extension);
   virtual ~ShellWindow();
 
   // Instantiates a platform-specific ShellWindow subclass (one implementation
   // per platform). Public users of ShellWindow should use ShellWindow::Create.
-  static ShellWindow* CreateShellWindow(ExtensionHost* host);
+  static ShellWindow* CreateShellWindow(PlatformAppHost* host,
+                                        const Extension* extension);
 
   const SessionID session_id_;
-  scoped_ptr<ExtensionHost> host_;
+  scoped_ptr<PlatformAppHost> host_;
+  const Extension* extension_;
   content::NotificationRegistrar registrar_;
   scoped_ptr<ExtensionWindowController> extension_window_controller_;