diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 23:37:00 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 23:37:00 +0000 |
| commit | 140905c70becf18808f2ad9d55d6efc00cb96461 (patch) | |
| tree | c8a71d1149012d01bfd91c59740704d164d82b81 /gpu | |
| parent | 8f3cf5f5413e223a40fddc111759536df1400893 (diff) | |
| download | chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.zip chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.tar.gz chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.tar.bz2 | |
Update all users of base::Version to explicitly specify the namespace, and clean up the header.
BUG=none
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/100543005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/config/gpu_info.cc | 2 | ||||
| -rw-r--r-- | gpu/config/gpu_info.h | 2 | ||||
| -rw-r--r-- | gpu/config/gpu_info_collector_win.cc | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc index c3dc16f..f789790 100644 --- a/gpu/config/gpu_info.cc +++ b/gpu/config/gpu_info.cc @@ -48,7 +48,7 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const { bool optimus; bool amd_switchable; bool lenovo_dcute; - Version display_link_version; + base::Version display_link_version; GPUDevice gpu; std::vector<GPUDevice> secondary_gpus; uint64 adapter_luid; diff --git a/gpu/config/gpu_info.h b/gpu/config/gpu_info.h index 09417f7..ec22ed5 100644 --- a/gpu/config/gpu_info.h +++ b/gpu/config/gpu_info.h @@ -66,7 +66,7 @@ struct GPU_EXPORT GPUInfo { // Version of DisplayLink driver installed. Zero if not installed. // http://crbug.com/177611. - Version display_link_version; + base::Version display_link_version; // Primary GPU, for exmaple, the discrete GPU in a dual GPU machine. GPUDevice gpu; diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc index 6467262..db608d9 100644 --- a/gpu/config/gpu_info_collector_win.cc +++ b/gpu/config/gpu_info_collector_win.cc @@ -170,23 +170,23 @@ GpuPerformanceStats RetrieveGpuPerformanceStatsWithHistograms() { // Returns the display link driver version or an invalid version if it is // not installed. -Version DisplayLinkVersion() { +base::Version DisplayLinkVersion() { base::win::RegKey key; if (key.Open(HKEY_LOCAL_MACHINE, L"SOFTWARE", KEY_READ | KEY_WOW64_64KEY)) - return Version(); + return base::Version(); if (key.OpenKey(L"DisplayLink", KEY_READ | KEY_WOW64_64KEY)) - return Version(); + return base::Version(); if (key.OpenKey(L"Core", KEY_READ | KEY_WOW64_64KEY)) - return Version(); + return base::Version(); base::string16 version; if (key.ReadValue(L"Version", &version)) - return Version(); + return base::Version(); - return Version(WideToASCII(version)); + return base::Version(WideToASCII(version)); } // Returns whether Lenovo dCute is installed. |