Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6678)

Unified Diff: chrome/browser/ui/extensions/shell_window.h

Issue 11363250: Allow Chrome apps to create Ash Panels (apps v2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac and win builds Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0a7a43ffe80681434da1d7e5af5a82a103abd914..31f639e0f44e1f9c327ef0b45c12ba717a62a041 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_; }
@@ -202,6 +210,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_;
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698