Add platform_app flag to manifest.

Enforce constraint that a platform app must declare a panel as its
launch container.

BUG=none
TEST=unit tests added.


Review URL: http://codereview.chromium.org/8429023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108885 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 0 deletions

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index dbe72d1..70bb789 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -903,6 +903,12 @@ bool Extension::LoadIsApp(const DictionaryValue* manifest,
   if (manifest->HasKey(keys::kApp))
     is_app_ = true;
 
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnablePlatformApps)) {
+    if (manifest->HasKey(keys::kPlatformApp))
+      is_platform_app_ = true;
+  }
+
   return true;
 }
 
@@ -1275,6 +1281,7 @@ Extension::Extension(const FilePath& path, Location location)
       converted_from_user_script_(false),
       is_theme_(false),
       is_app_(false),
+      is_platform_app_(false),
       is_storage_isolated_(false),
       launch_container_(extension_misc::LAUNCH_TAB),
       launch_width_(0),
@@ -1515,6 +1522,13 @@ bool Extension::InitFromValue(const DictionaryValue& source, int flags,
     return false;
   }
 
+  if (is_platform_app_) {
+    if (launch_container() != extension_misc::LAUNCH_PANEL) {
+      *error = errors::kInvalidLaunchContainerForPlatform;
+      return false;
+    }
+  }
+
   // Initialize the permissions (optional).
   ExtensionAPIPermissionSet api_permissions;
   URLPatternSet host_permissions;