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

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

Issue 100543005: Update all users of base::Version to explicitly specify the namespace, and clean up the header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: someday it will work Created 7 years 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/updater/extension_downloader.cc
diff --git a/chrome/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc
index ca4193c6e5fb23c8dfc34f7ac07a581e3c6a64e5..44fee7fd4ac270cc1b9b1c0d9c695bf7edd8030b 100644
--- a/chrome/browser/extensions/updater/extension_downloader.cc
+++ b/chrome/browser/extensions/updater/extension_downloader.cc
@@ -96,7 +96,8 @@ bool ShouldRetryRequest(const net::URLRequestStatus& status,
} // namespace
-UpdateDetails::UpdateDetails(const std::string& id, const Version& version)
+UpdateDetails::UpdateDetails(const std::string& id,
+ const base::Version& version)
: id(id), version(version) {}
UpdateDetails::~UpdateDetails() {}
@@ -160,7 +161,7 @@ bool ExtensionDownloader::AddPendingExtension(const std::string& id,
// Use a zero version to ensure that a pending extension will always
// be updated, and thus installed (assuming all extensions have
// non-zero versions).
- Version version("0.0.0.0");
+ base::Version version("0.0.0.0");
DCHECK(version.IsValid());
return AddExtensionData(id,
@@ -205,7 +206,7 @@ void ExtensionDownloader::StartBlacklistUpdate(
}
bool ExtensionDownloader::AddExtensionData(const std::string& id,
- const Version& version,
+ const base::Version& version,
Manifest::Type extension_type,
const GURL& extension_update_url,
const std::string& update_url_data,
@@ -530,7 +531,7 @@ void ExtensionDownloader::DetermineUpdates(
std::vector<int>* result) {
// This will only be valid if one of possible_updates specifies
// browser_min_version.
- Version browser_version;
+ base::Version browser_version;
for (size_t i = 0; i < possible_updates.list.size(); i++) {
const UpdateManifest::Result* update = &possible_updates.list[i];
@@ -561,8 +562,8 @@ void ExtensionDownloader::DetermineUpdates(
VLOG(2) << id << " is at '" << version << "'";
- Version existing_version(version);
- Version update_version(update->version);
+ base::Version existing_version(version);
+ base::Version update_version(update->version);
if (!update_version.IsValid() ||
update_version.CompareTo(existing_version) <= 0) {
@@ -576,9 +577,9 @@ void ExtensionDownloader::DetermineUpdates(
if (!browser_version.IsValid()) {
chrome::VersionInfo version_info;
if (version_info.is_valid())
- browser_version = Version(version_info.Version());
+ browser_version = base::Version(version_info.Version());
}
- Version browser_min_version(update->browser_min_version);
+ base::Version browser_min_version(update->browser_min_version);
if (browser_version.IsValid() && browser_min_version.IsValid() &&
browser_min_version.CompareTo(browser_version) > 0) {
// TODO(asargent) - We may want this to show up in the extensions UI
@@ -705,7 +706,7 @@ void ExtensionDownloader::NotifyExtensionsDownloadFailed(
void ExtensionDownloader::NotifyUpdateFound(const std::string& id,
const std::string& version) {
- UpdateDetails updateInfo(id, Version(version));
+ UpdateDetails updateInfo(id, base::Version(version));
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_EXTENSION_UPDATE_FOUND,
content::NotificationService::AllBrowserContextsAndSources(),

Powered by Google App Engine
This is Rietveld 408576698