Make platform apps use and require a different container ("shell" instead of "panel")

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 4d9cf10dbfa37ab64ffa5f28bdc01db3db304603..2d4d4b593f1d5754fd85e16c3a51b95697ec7cd1 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -1103,7 +1103,9 @@ bool Extension::LoadLaunchContainer(const DictionaryValue* manifest,
     return false;
   }
 
-  if (launch_container_string == values::kLaunchContainerPanel) {
+  if (launch_container_string == values::kLaunchContainerShell) {
+    launch_container_ = extension_misc::LAUNCH_SHELL;
+  } else if (launch_container_string == values::kLaunchContainerPanel) {
     launch_container_ = extension_misc::LAUNCH_PANEL;
   } else if (launch_container_string == values::kLaunchContainerTab) {
     launch_container_ = extension_misc::LAUNCH_TAB;
@@ -1541,10 +1543,13 @@ bool Extension::InitFromValue(const DictionaryValue& source, int flags,
   }
 
   if (is_platform_app_) {
-    if (launch_container() != extension_misc::LAUNCH_PANEL) {
+    if (launch_container() != extension_misc::LAUNCH_SHELL) {
       *error = errors::kInvalidLaunchContainerForPlatform;
       return false;
     }
+  } else if (launch_container() == extension_misc::LAUNCH_SHELL) {
+    *error = errors::kInvalidLaunchContainerForNonPlatform;
+    return false;
   }
 
   // Initialize the permissions (optional).