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 2f8b89cd041c3ea5a52f2c0a33d3734e9f3b1f38..6e83e39ff5750ca9a40dda25f6e9417dc1b651e1 100644 |
--- a/chrome/browser/ui/extensions/shell_window.h |
+++ b/chrome/browser/ui/extensions/shell_window.h |
@@ -44,16 +44,23 @@ class ShellWindow : public content::NotificationObserver, |
public ImageLoadingTracker::Observer, |
public extensions::ExtensionKeybindingRegistry::Delegate { |
public: |
- struct CreateParams { |
- enum Frame { |
- FRAME_CHROME, // Chrome-style window frame. |
- FRAME_NONE, // Frameless window. |
- }; |
+ enum WindowType { |
+ WINDOW_TYPE_DEFAULT, // Default shell window |
+ WINDOW_TYPE_PANEL, // OS controlled panel window (Ash only) |
+ }; |
+ |
+ enum Frame { |
+ FRAME_CHROME, // Chrome-style window frame. |
+ FRAME_NONE, // Frameless window. |
+ }; |
+ struct CreateParams { |
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. |
@@ -85,6 +92,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_; } |
@@ -106,7 +114,8 @@ class ShellWindow : public content::NotificationObserver, |
void SaveWindowPosition(); |
protected: |
- ShellWindow(Profile* profile, |
+ ShellWindow(WindowType window_type, |
+ Profile* profile, |
const extensions::Extension* extension); |
virtual ~ShellWindow(); |
@@ -202,6 +211,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_; |