Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1196)

Unified Diff: chrome/browser/extensions/crx_installer.cc

Issue 666223005: Don't block shared_module extensions by the policy blacklist. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed FilePath Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/standard_management_policy_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/crx_installer.cc
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 9402445f083154d4af5b31ce3454ddd0f8558e32..731c8ef9a36f9041657b7617280a7997e66cf287 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -486,14 +486,8 @@ void CrxInstaller::CheckInstall() {
Version version_required(i->minimum_version);
const Extension* imported_module =
service->GetExtensionById(i->extension_id, true);
- if (!imported_module) {
- ReportFailureFromUIThread(CrxInstallerError(l10n_util::GetStringFUTF16(
- IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_FOUND,
- base::ASCIIToUTF16(i->extension_id),
- base::ASCIIToUTF16(i->minimum_version))));
- return;
- } else if (imported_module &&
- !SharedModuleInfo::IsSharedModule(imported_module)) {
+ if (imported_module &&
+ !SharedModuleInfo::IsSharedModule(imported_module)) {
ReportFailureFromUIThread(CrxInstallerError(l10n_util::GetStringFUTF16(
IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_SHARED_MODULE,
base::UTF8ToUTF16(imported_module->name()))));
@@ -508,8 +502,8 @@ void CrxInstaller::CheckInstall() {
base::ASCIIToUTF16(imported_module->version()->GetString()))));
return;
} else if (imported_module &&
- !SharedModuleInfo::IsExportAllowedByWhitelist(imported_module,
- extension()->id())) {
+ !SharedModuleInfo::IsExportAllowedByWhitelist(
+ imported_module, extension()->id())) {
ReportFailureFromUIThread(CrxInstallerError(l10n_util::GetStringFUTF16(
IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_WHITELISTED,
base::UTF8ToUTF16(extension()->name()),
« no previous file with comments | « no previous file | chrome/browser/extensions/standard_management_policy_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698