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

Unified Diff: chrome/browser/component_updater/swiftshader_component_installer.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
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 1e82d3e49bcf83438631bca81a2f71778c293839..a876aa4801f8a685bc5dcc1963d87f2591828238 100644
--- a/chrome/browser/component_updater/swiftshader_component_installer.cc
+++ b/chrome/browser/component_updater/swiftshader_component_installer.cc
@@ -64,7 +64,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;
@@ -72,7 +72,7 @@ bool GetLatestSwiftShaderDirectory(base::FilePath* result,
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 &&
@@ -98,7 +98,7 @@ void RegisterSwiftShaderWithChrome(const base::FilePath& path) {
class SwiftShaderComponentInstaller : public update_client::CrxInstaller {
public:
- explicit SwiftShaderComponentInstaller(const Version& version);
+ explicit SwiftShaderComponentInstaller(const base::Version& version);
// ComponentInstaller implementation:
void OnUpdateError(int error) override;
@@ -114,11 +114,11 @@ class SwiftShaderComponentInstaller : public update_client::CrxInstaller {
private:
~SwiftShaderComponentInstaller() override {}
- Version current_version_;
+ base::Version current_version_;
};
SwiftShaderComponentInstaller::SwiftShaderComponentInstaller(
- const Version& version)
+ const base::Version& version)
: current_version_(version) {
DCHECK(version.IsValid());
}
@@ -136,7 +136,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)
@@ -170,7 +170,7 @@ bool SwiftShaderComponentInstaller::Uninstall() {
}
void FinishSwiftShaderUpdateRegistration(ComponentUpdateService* cus,
- const Version& version) {
+ const base::Version& version) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
update_client::CrxComponent swiftshader;
@@ -206,7 +206,7 @@ void UpdateChecker::OnGpuInfoUpdate() {
DCHECK_CURRENTLY_ON(BrowserThread::FILE);
base::FilePath path = GetSwiftShaderBaseDirectory();
- Version version(kNullVersion);
+ base::Version version(kNullVersion);
GetLatestSwiftShaderDirectory(&path, &version, NULL);
BrowserThread::PostTask(
@@ -230,7 +230,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,
« no previous file with comments | « chrome/browser/component_updater/sw_reporter_installer_win.cc ('k') | chrome/browser/enumerate_modules_model_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698