summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 21:13:59 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 21:13:59 +0000
commit54821359244e0609d7c86faadf5a1b6d0f5b5388 (patch)
tree9803f6ab672bbd9e5f35478abb90fac9b4b3b534 /chrome/browser
parent0e8ed61c551ff09acf3401804feb7e0409486e76 (diff)
downloadchromium_src-54821359244e0609d7c86faadf5a1b6d0f5b5388.zip
chromium_src-54821359244e0609d7c86faadf5a1b6d0f5b5388.tar.gz
chromium_src-54821359244e0609d7c86faadf5a1b6d0f5b5388.tar.bz2
Add OS version information to the bug report utility for the Mac version.
BUG= http://crbug.com/26138 TEST= none Review URL: http://codereview.chromium.org/355013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/bug_report_util.cc8
-rw-r--r--chrome/browser/bug_report_util.h3
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index f18b2cd5..5db9e48 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -71,9 +71,13 @@ void BugReportUtil::SetOSVersion(std::string *os_version) {
} else {
*os_version = "unknown";
}
+#elif defined(OS_MACOSX)
+ int32 major;
+ int32 minor;
+ int32 bugFix;
+ base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugFix);
+ *os_version = StringPrintf("%d.%d.%d", major, minor, bugFix);
#else
- // Right now, we only get the OS Version for Windows.
- // TODO(mirandac): make this cross-platform.
*os_version = "unknown";
#endif
}
diff --git a/chrome/browser/bug_report_util.h b/chrome/browser/bug_report_util.h
index 53feecf..2c13cff 100644
--- a/chrome/browser/bug_report_util.h
+++ b/chrome/browser/bug_report_util.h
@@ -11,6 +11,7 @@
#include "base/basictypes.h"
#if defined(OS_MACOSX)
#include "base/mac_util.h"
+#include "base/sys_info.h"
#endif
#include "base/scoped_ptr.h"
@@ -20,7 +21,7 @@ class TabContents;
class BugReportUtil {
public:
// SetOSVersion copies the maj.minor.build + servicePack_string
- // into a string (for Windows only). We currently have:
+ // into a string. We currently have:
// win_util::GetWinVersion returns WinVersion, which is just
// an enum of 2000, XP, 2003, or VISTA. Not enough detail for
// bug reports.