diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 00:35:18 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 00:35:18 +0000 |
| commit | 61b8ad79a502d0b3666305307e3cba9208a6c2e9 (patch) | |
| tree | 8a0653f9909ee9b54d7f2982d75f10ae7aec4bd1 /webkit | |
| parent | 87fc168b364ef36033f72e545a4894bd7ce9354f (diff) | |
| download | chromium_src-61b8ad79a502d0b3666305307e3cba9208a6c2e9.zip chromium_src-61b8ad79a502d0b3666305307e3cba9208a6c2e9.tar.gz chromium_src-61b8ad79a502d0b3666305307e3cba9208a6c2e9.tar.bz2 | |
Creating a unique user-agent string for ChromeOS builds, so that metrics can be aggregated separately from standard Chrome on Linux
Review URL: http://codereview.chromium.org/155101
Patch from Chris Masone <cmasone@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 8ffb59f..2c8d032 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -294,14 +294,15 @@ Singleton<UserAgentState> g_user_agent; std::string BuildOSCpuInfo() { std::string os_cpu; -#if defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) int32 os_major_version = 0; int32 os_minor_version = 0; int32 os_bugfix_version = 0; base::SysInfo::OperatingSystemVersionNumbers(&os_major_version, &os_minor_version, &os_bugfix_version); -#else +#endif +#if !defined(OS_WIN) && !defined(OS_MACOSX) // Should work on any Posix system. struct utsname unixinfo; uname(&unixinfo); @@ -327,6 +328,12 @@ std::string BuildOSCpuInfo() { os_major_version, os_minor_version, os_bugfix_version +#elif defined(OS_CHROMEOS) + "CrOS %s %d.%d.%d", + cputype.c_str(), // e.g. i686 + os_major_version, + os_minor_version, + os_bugfix_version #else "%s %s", unixinfo.sysname, // e.g. Linux |