diff options
| author | thakis <thakis@chromium.org> | 2015-08-18 20:26:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-19 03:27:46 +0000 |
| commit | 37be69cfdb84f4fdabcb779f443d18bbc04f1ffb (patch) | |
| tree | cb8baf96f447aa5cf415ae19f9f92aa9f43d2d11 /gpu | |
| parent | ec748bc5560f56d838178b07313e59bd4136f7ee (diff) | |
| download | chromium_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 '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 c035b46..23d5216 100644 --- a/gpu/config/gpu_info.cc +++ b/gpu/config/gpu_info.cc @@ -82,7 +82,7 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const { bool optimus; bool amd_switchable; bool lenovo_dcute; - base::Version display_link_version; + 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 a43540c..d6f61fd 100644 --- a/gpu/config/gpu_info.h +++ b/gpu/config/gpu_info.h @@ -119,7 +119,7 @@ struct GPU_EXPORT GPUInfo { // Version of DisplayLink driver installed. Zero if not installed. // http://crbug.com/177611. - base::Version display_link_version; + 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 26a8f03..f51764d 100644 --- a/gpu/config/gpu_info_collector_win.cc +++ b/gpu/config/gpu_info_collector_win.cc @@ -53,23 +53,23 @@ enum DisplayLinkInstallationStatus { // Returns the display link driver version or an invalid version if it is // not installed. -base::Version DisplayLinkVersion() { +Version DisplayLinkVersion() { base::win::RegKey key; if (key.Open(HKEY_LOCAL_MACHINE, L"SOFTWARE", KEY_READ | KEY_WOW64_64KEY)) - return base::Version(); + return Version(); if (key.OpenKey(L"DisplayLink", KEY_READ | KEY_WOW64_64KEY)) - return base::Version(); + return Version(); if (key.OpenKey(L"Core", KEY_READ | KEY_WOW64_64KEY)) - return base::Version(); + return Version(); base::string16 version; if (key.ReadValue(L"Version", &version)) - return base::Version(); + return Version(); - return base::Version(base::UTF16ToASCII(version)); + return Version(base::UTF16ToASCII(version)); } // Returns whether Lenovo dCute is installed. |