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

Unified Diff: chrome/common/chrome_switches.cc

Issue 8429023: Add platform_app flag to manifest. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge conflict resolution. Created 9 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
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index b304287f5e318486af28bd1fe117ef3eb6403cb3..3dd62e41fe7b3d7c90a9fc18b28b5e240a6aa514 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -280,6 +280,9 @@ const char kDisableIPv6[] = "disable-ipv6";
// attempt to use the existing connection.
const char kDisableIPPooling[] = "disable-ip-pooling";
+// Disables panels (always on-top docked pop-up windows).
+const char kDisablePanels[] = "disable-panels";
+
// Disable speculative TCP/IP preconnection.
const char kDisablePreconnect[] = "disable-preconnect";
@@ -506,14 +509,14 @@ const char kEnableNaClDebug[] = "enable-nacl-debug";
// Enabled integrated bookmark features in the New Tab pane.
const char kEnableNTPBookmarkFeatures[] = "enable-ntp-bookmark-features";
+// Enables advanced app capabilities.
+const char kEnablePlatformApps[] = "enable-platform-apps";
+
// Enables content settings based on host *and* plug-in in the user
// preferences.
const char kEnableResourceContentSettings[] =
"enable-resource-content-settings";
-// Disables panels (always on-top docked pop-up windows).
-const char kDisablePanels[] = "disable-panels";
-
// Enables speculative TCP/IP preconnection.
const char kEnablePreconnect[] = "enable-preconnect";
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698