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

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

Issue 14973007: Auto-install/uninstall shared module dependencies for extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 7 years, 6 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/extension_prefs.h » ('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 424ef621e98bc9451e164adfde9451466933dba9..7560b665ab2a9a8154783ed27ed7e8d4318fb904 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -412,17 +412,8 @@ void CrxInstaller::CheckImportsAndRequirements() {
Version version_required(i->minimum_version);
const Extension* imported_module =
service->GetExtensionById(i->extension_id, true);
- if (!imported_module ||
- (version_required.IsValid() &&
- imported_module->version()->CompareTo(version_required) < 0)) {
- ReportFailureFromUIThread(
- CrxInstallerError(l10n_util::GetStringFUTF16(
- IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_FOUND,
- ASCIIToUTF16(i->extension_id),
- ASCIIToUTF16(i->minimum_version))));
- return;
- }
- if (!SharedModuleInfo::IsSharedModule(imported_module)) {
+ if (imported_module &&
+ !SharedModuleInfo::IsSharedModule(imported_module)) {
ReportFailureFromUIThread(
CrxInstallerError(l10n_util::GetStringFUTF16(
IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_SHARED_MODULE,
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698