Allow Chrome apps to create Ash Panels (apps v2)

chrome/browser/ui/extensions/shell_window.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
@@ skipping 26 matching lines @@
 
 // ShellWindow is the type of window used by platform apps. Shell windows
 // have a WebContents but none of the chrome of normal browser windows.
 class ShellWindow : public content::NotificationObserver,
                     public content::WebContentsDelegate,
                     public content::WebContentsObserver,
                     public ExtensionFunctionDispatcher::Delegate,
                     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
     // value.
     gfx::Rect bounds;
     // Specify if bounds should be restored from a previous time.
     bool restore_position;
     bool restore_size;
 
     gfx::Size minimum_size;
@@ skipping 15 matching lines @@
 
   // Convert draggable regions in raw format to SkRegion format. Caller is
   // responsible for deleting the returned SkRegion instance.
   static SkRegion* RawDraggableRegionsToSkRegion(
       const std::vector<extensions::DraggableRegion>& regions);
 
   const std::string& window_key() const { return window_key_; }
   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_; }
 
   BaseWindow* GetBaseWindow();
   gfx::NativeWindow GetNativeWindow() {
     return GetBaseWindow()->GetNativeWindow();
   }
 
   // NativeShellWindows should call this to determine what the window's title
   // is on startup and from within UpdateWindowTitle().
   virtual string16 GetTitle() const;
 
   // Call to notify ShellRegistry and delete the window. Subclasses should
   // invoke this method instead of using "delete this".
   void OnNativeClose();
 
   // Should be called by native implementations when the window size/position
   // has changed.
   void SaveWindowPosition();
 
  protected:
-  ShellWindow(Profile* profile,
+  ShellWindow(WindowType window_type,
+              Profile* profile,
               const extensions::Extension* extension);
   virtual ~ShellWindow();
 
  private:
   // PlatformAppBrowserTest needs access to web_contents()
   friend class extensions::PlatformAppBrowserTest;
 
   // Instantiates a platform-specific ShellWindow subclass (one implementation
   // per platform). Public users of ShellWindow should use ShellWindow::Create.
   void Init(const GURL& url, const CreateParams& params);
@@ skipping 75 matching lines @@
   Profile* profile_;  // weak pointer - owned by ProfileManager.
   // weak pointer - owned by ExtensionService.
   const extensions::Extension* extension_;
 
   // Identifier that is used when saving and restoring geometry for this
   // window.
   std::string window_key_;
 
   const SessionID session_id_;
   scoped_ptr<content::WebContents> web_contents_;
+  WindowType window_type_;
   content::NotificationRegistrar registrar_;
   ExtensionFunctionDispatcher extension_function_dispatcher_;
 
   // Icon showed in the task bar.
   gfx::Image app_icon_;
 
   // Used for loading app_icon_.
   scoped_ptr<ImageLoadingTracker> app_icon_loader_;
 
   scoped_ptr<NativeShellWindow> native_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
 #endif  // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_