diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:34:45 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:34:45 +0000 |
| commit | 5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac (patch) | |
| tree | b3b4d32437596c5462b1907e6c68f2db2d15b8a0 /webkit/glue | |
| parent | 186bf92abfcce5136acb040c301959ff6ca96028 (diff) | |
| download | chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.zip chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.gz chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.bz2 | |
Revert 80819 due to failed tests
TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/6816024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/user_agent.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/webkit/glue/user_agent.cc b/webkit/glue/user_agent.cc index f92bc9a..c8d8b24 100644 --- a/webkit/glue/user_agent.cc +++ b/webkit/glue/user_agent.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -64,15 +64,14 @@ std::string BuildOSCpuInfo() { #if defined(OS_WIN) std::string architecture_token; - base::win::OSInfo* os_info = base::win::OSInfo::GetInstance(); - if (os_info->wow64_status() == base::win::OSInfo::WOW64_ENABLED) { + if (base::win::GetWOW64Status() == base::win::WOW64_ENABLED) { architecture_token = "; WOW64"; } else { - base::win::OSInfo::WindowsArchitecture windows_architecture = - os_info->architecture(); - if (windows_architecture == base::win::OSInfo::X64_ARCHITECTURE) + base::win::WindowsArchitecture windows_architecture = + base::win::GetWindowsArchitecture(); + if (windows_architecture == base::win::X64_ARCHITECTURE) architecture_token = "; Win64; x64"; - else if (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE) + else if (windows_architecture == base::win::IA64_ARCHITECTURE) architecture_token = "; Win64; IA64"; } #endif |