Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/public/common/user_agent.h" | 5 #include "content/public/common/user_agent.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 | 12 |
| 13 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 13 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 14 #include <sys/utsname.h> | 14 #include <sys/utsname.h> |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
| 18 #include "base/win/windows_version.h" | 18 #include "base/win/windows_version.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 // Generated | 21 // Generated |
| 22 #include "webkit_version.h" // NOLINT | 22 #include "webkit_version.h" // NOLINT |
| 23 | 23 |
| 24 namespace content { | 24 namespace content { |
| 25 | 25 |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| 28 #if defined(OS_ANDROID) | 28 #if defined(OS_ANDROID) |
| 29 std::string GetAndroidDeviceName() { | 29 std::string GetAndroidDeviceName() { |
| 30 return base::SysInfo::GetDeviceName(); | 30 return base::SysInfo::HardwareModelName(); |
|
jdduke (slow)
2015/07/14 18:46:48
Nit: I think we can remove this method and just in
tdresser
2015/07/14 19:02:27
Done.
| |
| 31 } | 31 } |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 } // namespace | 34 } // namespace |
| 35 | 35 |
| 36 std::string GetWebKitVersion() { | 36 std::string GetWebKitVersion() { |
| 37 return base::StringPrintf("%d.%d (%s)", | 37 return base::StringPrintf("%d.%d (%s)", |
| 38 WEBKIT_VERSION_MAJOR, | 38 WEBKIT_VERSION_MAJOR, |
| 39 WEBKIT_VERSION_MINOR, | 39 WEBKIT_VERSION_MINOR, |
| 40 WEBKIT_SVN_REVISION); | 40 WEBKIT_SVN_REVISION); |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 206 os_info.c_str(), | 206 os_info.c_str(), |
| 207 WEBKIT_VERSION_MAJOR, | 207 WEBKIT_VERSION_MAJOR, |
| 208 WEBKIT_VERSION_MINOR, | 208 WEBKIT_VERSION_MINOR, |
| 209 product.c_str(), | 209 product.c_str(), |
| 210 WEBKIT_VERSION_MAJOR, | 210 WEBKIT_VERSION_MAJOR, |
| 211 WEBKIT_VERSION_MINOR); | 211 WEBKIT_VERSION_MINOR); |
| 212 return user_agent; | 212 return user_agent; |
| 213 } | 213 } |
| 214 | 214 |
| 215 } // namespace content | 215 } // namespace content |
| OLD | NEW |