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 /chrome/browser/bug_report_util.cc | |
| 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 'chrome/browser/bug_report_util.cc')
| -rw-r--r-- | chrome/browser/bug_report_util.cc | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc index ebb8e24..8ba0e2c 100644 --- a/chrome/browser/bug_report_util.cc +++ b/chrome/browser/bug_report_util.cc @@ -13,7 +13,6 @@ #include "base/memory/singleton.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "base/win/windows_version.h" #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" @@ -136,19 +135,19 @@ void BugReportUtil::PostCleanup::OnURLFetchComplete( // Process the error for debug output if (response_code == kHttpPostFailNoConnection) { - error_stream << "No connection to server."; + error_stream << "No connection to server."; } else if ((response_code > kHttpPostFailClientError) && - (response_code < kHttpPostFailServerError)) { - error_stream << "Client error: HTTP response code " << response_code; + (response_code < kHttpPostFailServerError)) { + error_stream << "Client error: HTTP response code " << response_code; } else if (response_code > kHttpPostFailServerError) { - error_stream << "Server error: HTTP response code " << response_code; + error_stream << "Server error: HTTP response code " << response_code; } else { - error_stream << "Unknown error: HTTP response code " << response_code; + error_stream << "Unknown error: HTTP response code " << response_code; } } - LOG(WARNING) << "FEEDBACK: Submission to feedback server (" << url - << ") status: " << error_stream.str(); + LOG(WARNING) << "FEEDBACK: Submission to feedback server (" << url << + ") status: " << error_stream.str() << std::endl; // Delete the URLFetcher. delete source; @@ -157,15 +156,21 @@ void BugReportUtil::PostCleanup::OnURLFetchComplete( } // static -void BugReportUtil::SetOSVersion(std::string* os_version) { +void BugReportUtil::SetOSVersion(std::string *os_version) { #if defined(OS_WIN) - base::win::OSInfo* os_info = base::win::OSInfo::GetInstance(); - base::win::OSInfo::VersionNumber version_number = os_info->version_number(); - *os_version = StringPrintf("%d.%d.%d", version_number.major, - version_number.minor, version_number.build); - int service_pack = os_info->service_pack().major; - if (service_pack > 0) - os_version->append(StringPrintf("Service Pack %d", service_pack)); + OSVERSIONINFO osvi; + ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + + if (GetVersionEx(&osvi)) { + *os_version = StringPrintf("%d.%d.%d %S", + osvi.dwMajorVersion, + osvi.dwMinorVersion, + osvi.dwBuildNumber, + osvi.szCSDVersion); + } else { + *os_version = "unknown"; + } #elif defined(OS_MACOSX) int32 major; int32 minor; |