Implement new strategy for default apps

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 bdf130e46db291de9dbddbc8d12ec060794c25bd..f6c7b1ba841475136cbc056bfbafc9d19e42a36e 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -733,14 +733,8 @@ bool Extension::ContainsNonThemeKeys(const DictionaryValue& source) {
 
 bool Extension::LoadIsApp(const DictionaryValue* manifest,
                           std::string* error) {
-  if (manifest->HasKey(keys::kApp)) {
-    if (!apps_enabled_) {
-      *error = errors::kAppsNotEnabled;
-      return false;
-    } else {
-      is_app_ = true;
-    }
-  }
+  if (manifest->HasKey(keys::kApp))
+    is_app_ = true;
 
   return true;
 }
@@ -959,7 +953,6 @@ Extension::Extension(const FilePath& path)
   DCHECK(path.IsAbsolute());
 
   static_data_ = mutable_static_data_;
-  apps_enabled_ = AppsAreEnabled();
   location_ = INVALID;
 
 #if defined(OS_WIN)
@@ -1165,11 +1158,6 @@ GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
               chrome::kStandardSchemeSeparator + extension_id + "/");
 }
 
-// static
-bool Extension::AppsAreEnabled() {
-  return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableApps);
-}
-
 bool Extension::InitFromValue(const DictionaryValue& source, bool require_key,
                               std::string* error) {
   // Unit tests reuse Extension objects, so we need to reset mutable_static_data