diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 00:48:41 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 00:48:41 +0000 |
| commit | bd78698c1116e009d8219fa514ba9a7cae40f96e (patch) | |
| tree | 7dd2e3352b378551e1300178c59afd199e0544f8 /content/gpu | |
| parent | c4803e43232864180e5db4fb3b8d185dc0c5ba84 (diff) | |
| download | chromium_src-bd78698c1116e009d8219fa514ba9a7cae40f96e.zip chromium_src-bd78698c1116e009d8219fa514ba9a7cae40f96e.tar.gz chromium_src-bd78698c1116e009d8219fa514ba9a7cae40f96e.tar.bz2 | |
Revert 190448 "Revert 189680 "Fix registry key reading bug""
Turns out this is ok, we want this in m27.
> Revert 189680 "Fix registry key reading bug"
>
> caused major hangs on canary. will reland when there's a fix for crbug.com/181665
>
> > Fix registry key reading bug
> >
> > The current code succeeds even if the keys are not in the machine
> > therefore dCute is detected and the videocard capabilities are
> > downgraded
> >
> > BUG=181665
> > TEST=see bug
> > Review URL: https://codereview.chromium.org/12534013
>
> TBR=cpu@chromium.org
> Review URL: https://codereview.chromium.org/12704020
TBR=karen@chromium.org
Review URL: https://codereview.chromium.org/12906015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_info_collector_win.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index 462459b..c085681 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -189,15 +189,13 @@ Version DisplayLinkVersion() { bool IsLenovoDCuteInstalled() { base::win::RegKey key; - if (FAILED(key.Open( - HKEY_LOCAL_MACHINE, L"SOFTWARE", KEY_READ | KEY_WOW64_64KEY))) { + if (key.Open(HKEY_LOCAL_MACHINE, L"SOFTWARE", KEY_READ | KEY_WOW64_64KEY)) return false; - } - if (FAILED(key.OpenKey(L"Lenovo", KEY_READ | KEY_WOW64_64KEY))) + if (key.OpenKey(L"Lenovo", KEY_READ | KEY_WOW64_64KEY)) return false; - if (FAILED(key.OpenKey(L"Lenovo dCute", KEY_READ | KEY_WOW64_64KEY))) + if (key.OpenKey(L"Lenovo dCute", KEY_READ | KEY_WOW64_64KEY)) return false; return true; @@ -375,7 +373,7 @@ namespace gpu_info_collector { #if !defined(GOOGLE_CHROME_BUILD) AMDVideoCardType GetAMDVideocardType() { - return UNKNOWN; + return STANDALONE; } #else // This function has a real implementation for official builds that can |