Implement new strategy for default apps

chrome/common/extensions/extension.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/base64.h"
@@ skipping 715 matching lines @@
   for (DictionaryValue::key_iterator key = source.begin_keys();
        key != source.end_keys(); ++key) {
     if (!IsBaseCrxKey(*key) && *key != keys::kTheme)
       return true;
   }
   return false;
 }
 
 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;
 }
 
 bool Extension::LoadExtent(const DictionaryValue* manifest,
                            const char* key,
                            ExtensionExtent* extent,
                            const char* list_error,
                            const char* value_error,
                            std::string* error) {
@@ skipping 198 matching lines @@
       is_theme_(false),
       is_app_(false),
       launch_container_(extension_misc::LAUNCH_TAB),
       launch_width_(0),
       launch_height_(0),
       background_page_ready_(false),
       being_upgraded_(false) {
   DCHECK(path.IsAbsolute());
 
   static_data_ = mutable_static_data_;
-  apps_enabled_ = AppsAreEnabled();
   location_ = INVALID;
 
 #if defined(OS_WIN)
   // Normalize any drive letter to upper-case. We do this for consistency with
   // net_utils::FilePathToFileURL(), which does the same thing, to make string
   // comparisons simpler.
   std::wstring path_str = path.value();
   if (path_str.size() >= 2 && path_str[0] >= L'a' && path_str[0] <= L'z' &&
       path_str[1] == ':')
     path_str[0] += ('A' - 'a');
@@ skipping 185 matching lines @@
   }
 
   result->swap(decoded);
 }
 
 GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
   return GURL(std::string(chrome::kExtensionScheme) +
               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
   // when we re-initialize.
   mutable_static_data_ = const_cast<StaticData*>(static_data_.get());
 
   if (source.HasKey(keys::kPublicKey)) {
     std::string public_key_bytes;
     if (!source.GetString(keys::kPublicKey, &public_key_) ||
         !ParsePEMKeyBytes(public_key_, &public_key_bytes) ||
@@ skipping 991 matching lines @@
 UninstalledExtensionInfo::UninstalledExtensionInfo(
     const Extension& extension)
     : extension_id(extension.id()),
       extension_api_permissions(extension.api_permissions()),
       is_theme(extension.is_theme()),
       is_app(extension.is_app()),
       converted_from_user_script(extension.converted_from_user_script()),
       update_url(extension.update_url()) {}
 
 UninstalledExtensionInfo::~UninstalledExtensionInfo() {}