diff options
Diffstat (limited to 'chrome/browser/component_updater/swiftshader_component_installer.cc')
-rw-r--r-- | chrome/browser/component_updater/swiftshader_component_installer.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc index 4e63685..038c294 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, - base::Version* latest, + 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()) { - base::Version version(path.BaseName().MaybeAsASCII()); + 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 base::Version& version); + explicit SwiftShaderComponentInstaller(const Version& version); virtual ~SwiftShaderComponentInstaller() {} @@ -109,11 +109,11 @@ class SwiftShaderComponentInstaller : public ComponentInstaller { base::FilePath* installed_file) OVERRIDE; private: - base::Version current_version_; + Version current_version_; }; SwiftShaderComponentInstaller::SwiftShaderComponentInstaller( - const base::Version& version) : current_version_(version) { + const 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); - base::Version version(proposed_version.c_str()); + 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 base::Version& version) { + const 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(); - base::Version version(kNullVersion); + Version version(kNullVersion); GetLatestSwiftShaderDirectory(&path, &version, NULL); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, @@ -215,7 +215,7 @@ void RegisterSwiftShaderPath(ComponentUpdateService* cus) { } } - base::Version version(kNullVersion); + Version version(kNullVersion); std::vector<base::FilePath> older_dirs; if (GetLatestSwiftShaderDirectory(&path, &version, &older_dirs)) BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |