diff options
Diffstat (limited to 'chrome/common/extensions/extension.cc')
| -rw-r--r-- | chrome/common/extensions/extension.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index b90f446..4a5dbcc 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -745,14 +745,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; } @@ -971,7 +965,6 @@ Extension::Extension(const FilePath& path) DCHECK(path.IsAbsolute()); static_data_ = mutable_static_data_; - apps_enabled_ = AppsAreEnabled(); location_ = INVALID; #if defined(OS_WIN) @@ -1177,11 +1170,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 |