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

Unified Diff: chrome/browser/extensions/updater/manifest_fetch_data.cc

Issue 532183003: Revert of Enable forced extension updates on NaCl arch mismatch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « chrome/browser/extensions/updater/manifest_fetch_data.h ('k') | extensions/common/extension.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/updater/manifest_fetch_data.cc
diff --git a/chrome/browser/extensions/updater/manifest_fetch_data.cc b/chrome/browser/extensions/updater/manifest_fetch_data.cc
index dafbdf87fae84544a5599b5b9edf021c4a26da13..8ed4fe041fba2b78d0e878857fd2982bbc864d1b 100644
--- a/chrome/browser/extensions/updater/manifest_fetch_data.cc
+++ b/chrome/browser/extensions/updater/manifest_fetch_data.cc
@@ -67,24 +67,16 @@
const std::string& version,
const PingData* ping_data,
const std::string& update_url_data,
- const std::string& install_source,
- bool force_update) {
+ const std::string& install_source) {
if (extension_ids_.find(id) != extension_ids_.end()) {
NOTREACHED() << "Duplicate extension id " << id;
return false;
}
- if (force_update)
- forced_updates_.insert(id);
-
- // If we want to force an update, we send 0.0.0.0 as the installed version
- // number.
- const std::string installed_version = force_update ? "0.0.0.0" : version;
-
// Compute the string we'd append onto the full_url_, and see if it fits.
std::vector<std::string> parts;
parts.push_back("id=" + id);
- parts.push_back("v=" + installed_version);
+ parts.push_back("v=" + version);
if (!install_source.empty())
parts.push_back("installsource=" + install_source);
parts.push_back("uc");
@@ -171,8 +163,4 @@
request_ids_.insert(other.request_ids_.begin(), other.request_ids_.end());
}
-bool ManifestFetchData::DidForceUpdate(const std::string& extension_id) const {
- return forced_updates_.find(extension_id) != forced_updates_.end();
-}
-
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/updater/manifest_fetch_data.h ('k') | extensions/common/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698