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

Unified Diff: extensions/browser/app_window/app_window.h

Issue 2891043002: Revert of Remove WINDOW_TYPE_V1_PANEL AppWindow type (Closed)
Patch Set: Created 3 years, 7 months 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: extensions/browser/app_window/app_window.h
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index a850d7137c0ff293eba7e93f14ee1537946a7778..72d3090fdef64ccfd60a5ccc7d0e9e9637796312 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -94,6 +94,8 @@
enum WindowType {
WINDOW_TYPE_DEFAULT = 1 << 0, // Default app window.
WINDOW_TYPE_PANEL = 1 << 1, // OS controlled panel window (Ash only).
+ WINDOW_TYPE_V1_PANEL = 1 << 2, // For apps v1 support in Ash; deprecate
+ // with v1 apps.
};
enum Frame {
@@ -233,7 +235,8 @@
content::WebContents* web_contents() const;
WindowType window_type() const { return window_type_; }
bool window_type_is_panel() const {
- return window_type_ == WINDOW_TYPE_PANEL;
+ return (window_type_ == WINDOW_TYPE_PANEL ||
+ window_type_ == WINDOW_TYPE_V1_PANEL);
}
content::BrowserContext* browser_context() const { return browser_context_; }
const gfx::Image& app_icon() const { return app_icon_; }

Powered by Google App Engine
This is Rietveld 408576698