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

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

Issue 706623004: Add minimum version to extension management (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ext-update-url
Patch Set: fix comment Created 6 years, 1 month 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
Index: chrome/browser/extensions/extension_management.cc
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index 5aeb5427551d08b4d92d0c393caaa3ba16d7b051..3d40157f5ef15acd9fdfabbb8e2a06a7476d701f 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -12,6 +12,7 @@
#include "base/prefs/pref_service.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
+#include "base/version.h"
#include "chrome/browser/extensions/extension_management_constants.h"
#include "chrome/browser/extensions/extension_management_internal.h"
#include "chrome/browser/extensions/external_policy_loader.h"
@@ -217,6 +218,21 @@ bool ExtensionManagement::IsPermissionSetAllowed(
return true;
}
+bool ExtensionManagement::CheckMinimumVersion(
Finnur 2014/11/19 10:16:25 I started wondering here if minimum_version is res
Finnur 2014/11/19 10:16:25 s/CheckMinimumVersion/IsAboveMinimumVersion/ ?
binjin 2014/11/19 13:36:10 Done. "above" is not strictly correct, it should a
binjin 2014/11/19 13:36:10 I'm not sure if I understand correctly, but the mi
Finnur 2014/11/19 15:47:38 Adding 'Requirement' suffix feels redundant here.
binjin 2014/11/19 17:21:41 This is not added to manifest of extension, it's p
Finnur 2014/11/19 20:50:18 OK, fine. If this is only set-able from the dictio
binjin 2014/11/20 13:11:54 Done (dropped suffix).
+ const Extension* extension,
+ std::string* required_version) const {
+ auto iter = settings_by_id_.find(extension->id());
+ // If there are no minimum version required for |extension|, return true.
+ if (iter == settings_by_id_.end() || !iter->second->minimum_version_required)
+ return true;
+ bool met_requirement = extension->version()->CompareTo(
Finnur 2014/11/19 10:16:25 nit: s/met_requirement/meets_requirement/
binjin 2014/11/19 13:36:10 Done.
+ *iter->second->minimum_version_required) >= 0;
+ // Output a human readable version string for prompting if necessary.
+ if (!met_requirement && required_version)
+ *required_version = iter->second->minimum_version_required->GetString();
+ return met_requirement;
+}
+
void ExtensionManagement::Refresh() {
// Load all extension management settings preferences.
const base::ListValue* allowed_list_pref =
@@ -419,7 +435,7 @@ internal::IndividualSettings* ExtensionManagement::AccessById(
SettingsIdMap::iterator it = settings_by_id_.find(id);
if (it == settings_by_id_.end()) {
scoped_ptr<internal::IndividualSettings> settings(
- new internal::IndividualSettings(*default_settings_));
+ new internal::IndividualSettings(default_settings_.get()));
it = settings_by_id_.add(id, settings.Pass()).first;
}
return it->second;
@@ -431,7 +447,7 @@ internal::IndividualSettings* ExtensionManagement::AccessByUpdateUrl(
SettingsUpdateUrlMap::iterator it = settings_by_update_url_.find(update_url);
if (it == settings_by_update_url_.end()) {
scoped_ptr<internal::IndividualSettings> settings(
- new internal::IndividualSettings(*default_settings_));
+ new internal::IndividualSettings(default_settings_.get()));
it = settings_by_update_url_.add(update_url, settings.Pass()).first;
}
return it->second;

Powered by Google App Engine
This is Rietveld 408576698