| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 | 5 |
| 6 //------------------------------------------------------------------------------ | 6 //------------------------------------------------------------------------------ |
| 7 // Description of the life cycle of a instance of MetricsService. | 7 // Description of the life cycle of a instance of MetricsService. |
| 8 // | 8 // |
| 9 // OVERVIEW | 9 // OVERVIEW |
| 10 // | 10 // |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #if defined(USE_SYSTEM_LIBBZ2) | 46 #if defined(USE_SYSTEM_LIBBZ2) |
| 47 #include <bzlib.h> | 47 #include <bzlib.h> |
| 48 #else | 48 #else |
| 49 #include "third_party/bzip2/bzlib.h" | 49 #include "third_party/bzip2/bzlib.h" |
| 50 #endif | 50 #endif |
| 51 | 51 |
| 52 #include "base/file_version_info.h" | 52 #include "base/file_version_info.h" |
| 53 #include "base/string_util.h" | 53 #include "base/string_util.h" |
| 54 #include "base/thread.h" | 54 #include "base/thread.h" |
| 55 #include "base/utf_string_conversions.h" | 55 #include "base/utf_string_conversions.h" |
| 56 #include "chrome/app/chrome_version_info.h" | 56 #include "chrome/common/chrome_version_info.h" |
| 57 #include "chrome/installer/util/browser_distribution.h" | 57 #include "chrome/installer/util/browser_distribution.h" |
| 58 #include "chrome/installer/util/chrome_frame_distribution.h" | 58 #include "chrome/installer/util/chrome_frame_distribution.h" |
| 59 #include "chrome/installer/util/google_update_settings.h" | 59 #include "chrome/installer/util/google_update_settings.h" |
| 60 #include "chrome_frame/bind_status_callback_impl.h" | 60 #include "chrome_frame/bind_status_callback_impl.h" |
| 61 #include "chrome_frame/crash_reporting/crash_metrics.h" | 61 #include "chrome_frame/crash_reporting/crash_metrics.h" |
| 62 #include "chrome_frame/utils.h" | 62 #include "chrome_frame/utils.h" |
| 63 #include "net/base/upload_data.h" | 63 #include "net/base/upload_data.h" |
| 64 #include "chrome_frame/urlmon_bind_status_callback.h" | 64 #include "chrome_frame/urlmon_bind_status_callback.h" |
| 65 | 65 |
| 66 using base::Time; | 66 using base::Time; |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 } | 455 } |
| 456 DiscardPendingLog(); | 456 DiscardPendingLog(); |
| 457 | 457 |
| 458 currently_uploading = 0; | 458 currently_uploading = 0; |
| 459 return ret; | 459 return ret; |
| 460 } | 460 } |
| 461 | 461 |
| 462 // static | 462 // static |
| 463 std::string MetricsService::GetVersionString() { | 463 std::string MetricsService::GetVersionString() { |
| 464 scoped_ptr<FileVersionInfo> version_info( | 464 scoped_ptr<FileVersionInfo> version_info( |
| 465 chrome_app::GetChromeVersionInfo()); | 465 chrome::GetChromeVersionInfo()); |
| 466 if (version_info.get()) { | 466 if (version_info.get()) { |
| 467 std::string version = WideToUTF8(version_info->product_version()); | 467 std::string version = WideToUTF8(version_info->product_version()); |
| 468 // Add the -F extensions to ensure that UMA data uploaded by ChromeFrame | 468 // Add the -F extensions to ensure that UMA data uploaded by ChromeFrame |
| 469 // lands in the ChromeFrame bucket. | 469 // lands in the ChromeFrame bucket. |
| 470 version += "-F"; | 470 version += "-F"; |
| 471 if (!version_info->is_official_build()) | 471 if (!version_info->is_official_build()) |
| 472 version.append("-devel"); | 472 version.append("-devel"); |
| 473 return version; | 473 return version; |
| 474 } else { | 474 } else { |
| 475 NOTREACHED() << "Unable to retrieve version string."; | 475 NOTREACHED() << "Unable to retrieve version string."; |
| 476 } | 476 } |
| 477 | 477 |
| 478 return std::string(); | 478 return std::string(); |
| 479 } | 479 } |
| 480 | |
| OLD | NEW |