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: extensions/browser/updater/extension_downloader.cc

Issue 1281313003: base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 5 years, 4 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 | « extensions/browser/api/runtime/runtime_api.cc ('k') | extensions/browser/user_script_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/updater/extension_downloader.cc
diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/browser/updater/extension_downloader.cc
index d1d6468b0c94dc866e49583767e2f0c9b1711bb4..eebe259dc6031062727fa411c9eccd3ac1a93fac 100644
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -146,9 +146,9 @@ bool IncrementAuthUserIndex(GURL* url) {
} // namespace
-UpdateDetails::UpdateDetails(const std::string& id, const Version& version)
- : id(id), version(version) {
-}
+UpdateDetails::UpdateDetails(const std::string& id,
+ const base::Version& version)
+ : id(id), version(version) {}
UpdateDetails::~UpdateDetails() {
}
@@ -232,7 +232,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,
@@ -296,7 +296,7 @@ void ExtensionDownloader::SetWebstoreIdentityProvider(
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,
@@ -661,8 +661,8 @@ void ExtensionDownloader::DetermineUpdates(
// We should skip the version check if update was forced.
if (!fetch_data.DidForceUpdate(id)) {
- 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) {
continue;
@@ -878,7 +878,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(
extensions::NOTIFICATION_EXTENSION_UPDATE_FOUND,
content::NotificationService::AllBrowserContextsAndSources(),
« no previous file with comments | « extensions/browser/api/runtime/runtime_api.cc ('k') | extensions/browser/user_script_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698