Chromium Code Reviews| 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 && |
|
elijahtaylor1
2014/10/22 16:40:01
As I stated in the other CL, this is probably ok.
Joao da Silva
2014/10/22 18:31:05
If you agree then it would be great to do this fix
elijahtaylor1
2014/10/22 19:57:49
I don't know much about external_loaders, but if w
Joao da Silva
2014/10/23 09:15:02
I think the drag-and-drop flow is the same as the
|
| + !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()), |