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

Unified Diff: chrome/browser/component_updater/swiftshader_component_installer.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/component_updater/swiftshader_component_installer.cc
diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc
index 038c294e402ff2c8f94d5d3212089387f7814043..4e63685bac203580d1ee34528e6826d03ca78da9 100644
--- a/chrome/browser/component_updater/swiftshader_component_installer.cc
+++ b/chrome/browser/component_updater/swiftshader_component_installer.cc
@@ -60,7 +60,7 @@ base::FilePath GetSwiftShaderBaseDirectory() {
// On success it returns something like:
// <profile>\AppData\Local\Google\Chrome\User Data\SwiftShader\10.3.44.555\.
bool GetLatestSwiftShaderDirectory(base::FilePath* result,
- Version* latest,
+ base::Version* latest,
std::vector<base::FilePath>* older_dirs) {
base::FilePath base_dir = GetSwiftShaderBaseDirectory();
bool found = false;
@@ -68,7 +68,7 @@ bool GetLatestSwiftShaderDirectory(base::FilePath* result,
file_enumerator(base_dir, false, base::FileEnumerator::DIRECTORIES);
for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
path = file_enumerator.Next()) {
- Version version(path.BaseName().MaybeAsASCII());
+ base::Version version(path.BaseName().MaybeAsASCII());
if (!version.IsValid())
continue;
if (version.CompareTo(*latest) > 0 &&
@@ -96,7 +96,7 @@ void RegisterSwiftShaderWithChrome(const base::FilePath& path) {
class SwiftShaderComponentInstaller : public ComponentInstaller {
public:
- explicit SwiftShaderComponentInstaller(const Version& version);
+ explicit SwiftShaderComponentInstaller(const base::Version& version);
virtual ~SwiftShaderComponentInstaller() {}
@@ -109,11 +109,11 @@ class SwiftShaderComponentInstaller : public ComponentInstaller {
base::FilePath* installed_file) OVERRIDE;
private:
- Version current_version_;
+ base::Version current_version_;
};
SwiftShaderComponentInstaller::SwiftShaderComponentInstaller(
- const Version& version) : current_version_(version) {
+ const base::Version& version) : current_version_(version) {
DCHECK(version.IsValid());
}
@@ -130,7 +130,7 @@ bool SwiftShaderComponentInstaller::Install(
return false;
std::string proposed_version;
manifest.GetStringASCII("version", &proposed_version);
- Version version(proposed_version.c_str());
+ base::Version version(proposed_version.c_str());
if (!version.IsValid())
return false;
if (current_version_.CompareTo(version) >= 0)
@@ -158,7 +158,7 @@ bool SwiftShaderComponentInstaller::GetInstalledFile(
}
void FinishSwiftShaderUpdateRegistration(ComponentUpdateService* cus,
- const Version& version) {
+ const base::Version& version) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
CrxComponent swiftshader;
@@ -195,7 +195,7 @@ void UpdateChecker::OnGpuInfoUpdate() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
base::FilePath path = GetSwiftShaderBaseDirectory();
- Version version(kNullVersion);
+ base::Version version(kNullVersion);
GetLatestSwiftShaderDirectory(&path, &version, NULL);
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
@@ -215,7 +215,7 @@ void RegisterSwiftShaderPath(ComponentUpdateService* cus) {
}
}
- Version version(kNullVersion);
+ base::Version version(kNullVersion);
std::vector<base::FilePath> older_dirs;
if (GetLatestSwiftShaderDirectory(&path, &version, &older_dirs))
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698