Allow Chrome apps to create Ash Panels (apps v2)

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 33286a7a14ab18d9f24e395c33070579f0a97f23..24110d5714953b301b1330b60743a0b17136d3d4 100644
--- a/chrome/browser/ui/extensions/shell_window.h
+++ b/chrome/browser/ui/extensions/shell_window.h
@@ -44,15 +44,21 @@ class ShellWindow : public content::NotificationObserver,
                     public ImageLoadingTracker::Observer,
                     public extensions::ExtensionKeybindingRegistry::Delegate {
  public:
+  enum WindowType {
+    WINDOW_TYPE_DEFAULT,  // Default shell window
+    WINDOW_TYPE_PANEL,  // OS controlled panel window (Ash only)
+  };

[jeremya, 2012/11/15 01:09:25]

Either this should go inside CreateParams or the Frame enum should come out.

[stevenjb, 2012/11/16 23:42:40]

Done.

+
   struct CreateParams {
     enum Frame {
-      FRAME_CHROME, // Chrome-style window frame.
-      FRAME_NONE, // Frameless window.
+      FRAME_CHROME,  // Chrome-style window frame.
+      FRAME_NONE,  // Frameless window.
     };
 
     CreateParams();
     ~CreateParams();
 
+    WindowType window_type;
     Frame frame;
     // Specify the initial bounds of the window. INT_MIN designates
     // 'unspecified' for any coordinate, and should be replaced with a default
@@ -88,6 +94,7 @@ class ShellWindow : public content::NotificationObserver,
   const SessionID& session_id() const { return session_id_; }
   const extensions::Extension* extension() const { return extension_; }
   content::WebContents* web_contents() const { return web_contents_.get(); }
+  WindowType window_type() const { return window_type_; }
   Profile* profile() const { return profile_; }
   const gfx::Image& app_icon() const { return app_icon_; }
 
@@ -109,7 +116,8 @@ class ShellWindow : public content::NotificationObserver,
   void SaveWindowPosition();
 
  protected:
-  ShellWindow(Profile* profile,
+  ShellWindow(WindowType window_type,
+              Profile* profile,
               const extensions::Extension* extension);
   virtual ~ShellWindow();
 
@@ -205,6 +213,7 @@ class ShellWindow : public content::NotificationObserver,
 
   const SessionID session_id_;
   scoped_ptr<content::WebContents> web_contents_;
+  WindowType window_type_;
   content::NotificationRegistrar registrar_;
   ExtensionFunctionDispatcher extension_function_dispatcher_;