diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/sys_info.h | 3 | ||||
| -rw-r--r-- | base/sys_info_posix.cc | 2 | ||||
| -rw-r--r-- | base/sys_info_win.cc | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/base/sys_info.h b/base/sys_info.h index 475c5a8..e1122b5 100644 --- a/base/sys_info.h +++ b/base/sys_info.h @@ -53,8 +53,7 @@ class BASE_EXPORT SysInfo { // Exact return value may differ across platforms. // e.g. a 32-bit x86 kernel on a 64-bit capable CPU will return "x86", // whereas a x86-64 kernel on the same CPU will return "x86_64" - // TODO(thestig) Rename this to OperatingSystemArchitecture(). - static std::string CPUArchitecture(); + static std::string OperatingSystemArchitecture(); // Avoid using this. Use base/cpu.h to get information about the CPU instead. // http://crbug.com/148884 diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc index 3419cf23..f2119cd 100644 --- a/base/sys_info_posix.cc +++ b/base/sys_info_posix.cc @@ -75,7 +75,7 @@ std::string SysInfo::OperatingSystemVersion() { #endif // static -std::string SysInfo::CPUArchitecture() { +std::string SysInfo::OperatingSystemArchitecture() { struct utsname info; if (uname(&info) < 0) { NOTREACHED(); diff --git a/base/sys_info_win.cc b/base/sys_info_win.cc index f5fa7d7..8b5e10d 100644 --- a/base/sys_info_win.cc +++ b/base/sys_info_win.cc @@ -74,7 +74,7 @@ std::string SysInfo::OperatingSystemVersion() { // See chrome/browser/feedback/feedback_util.h, FeedbackUtil::SetOSVersion. // static -std::string SysInfo::CPUArchitecture() { +std::string SysInfo::OperatingSystemArchitecture() { win::OSInfo::WindowsArchitecture arch = win::OSInfo::GetInstance()->architecture(); switch (arch) { |