summaryrefslogtreecommitdiffstats
path: root/extensions/browser/updater
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-08-18 20:26:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-19 03:27:46 +0000
commit37be69cfdb84f4fdabcb779f443d18bbc04f1ffb (patch)
treecb8baf96f447aa5cf415ae19f9f92aa9f43d2d11 /extensions/browser/updater
parentec748bc5560f56d838178b07313e59bd4136f7ee (diff)
downloadchromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.zip
chromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.tar.gz
chromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.tar.bz2
Revert of base: Remove using:: declaration from version.h header. (patchset #24 id:450001 of https://codereview.chromium.org/1281313003/ )
Reason for revert: Broke all official bots, e.g. http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/1926/steps/compile/logs/stdio c:\b\build\slave\google-chrome-rel-win\build\src\chrome\browser\component_updater\pepper_flash_component_installer.cc(326) :error C3861: 'Version': identifier not found Original issue's description: > base: Remove using:: declaration from version.h header. > > BUG=None > R=brettw@chromium.org > > Committed: https://crrev.com/9c2f5dc9c732beb936b41d073bf5ec7adefb0872 > Cr-Commit-Position: refs/heads/master@{#344088} TBR=brettw@chromium.org,tfarina@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None Review URL: https://codereview.chromium.org/1301883002 Cr-Commit-Position: refs/heads/master@{#344138}
Diffstat (limited to 'extensions/browser/updater')
-rw-r--r--extensions/browser/updater/extension_downloader.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/browser/updater/extension_downloader.cc
index eebe259..d1d6468 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 base::Version& version)
- : id(id), version(version) {}
+UpdateDetails::UpdateDetails(const std::string& id, const 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).
- base::Version version("0.0.0.0");
+ 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 base::Version& version,
+ const 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)) {
- base::Version existing_version(version);
- base::Version update_version(update->version);
+ Version existing_version(version);
+ 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, base::Version(version));
+ UpdateDetails updateInfo(id, Version(version));
content::NotificationService::current()->Notify(
extensions::NOTIFICATION_EXTENSION_UPDATE_FOUND,
content::NotificationService::AllBrowserContextsAndSources(),