| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 #include "base/file_version_info.h" | 54 #include "base/file_version_info.h" |
| 55 #include "base/lock.h" | 55 #include "base/lock.h" |
| 56 #include "base/string_split.h" | 56 #include "base/string_split.h" |
| 57 #include "base/string_util.h" | 57 #include "base/string_util.h" |
| 58 #include "base/stringprintf.h" | 58 #include "base/stringprintf.h" |
| 59 #include "base/thread.h" | 59 #include "base/thread.h" |
| 60 #include "base/string_number_conversions.h" | 60 #include "base/string_number_conversions.h" |
| 61 #include "base/utf_string_conversions.h" | 61 #include "base/utf_string_conversions.h" |
| 62 #include "chrome/common/chrome_version_info.h" | 62 #include "chrome/common/chrome_version_info.h" |
| 63 #include "chrome/common/net/url_fetcher.h" | 63 #include "chrome/common/net/url_fetcher.h" |
| 64 #include "chrome/common/net/url_fetcher_protect.h" | |
| 65 #include "chrome/common/net/url_request_context_getter.h" | 64 #include "chrome/common/net/url_request_context_getter.h" |
| 66 #include "chrome/installer/util/browser_distribution.h" | 65 #include "chrome/installer/util/browser_distribution.h" |
| 67 #include "chrome/installer/util/chrome_frame_distribution.h" | 66 #include "chrome/installer/util/chrome_frame_distribution.h" |
| 68 #include "chrome/installer/util/google_update_settings.h" | 67 #include "chrome/installer/util/google_update_settings.h" |
| 69 #include "chrome_frame/bind_status_callback_impl.h" | 68 #include "chrome_frame/bind_status_callback_impl.h" |
| 70 #include "chrome_frame/chrome_frame_delegate.h" | 69 #include "chrome_frame/chrome_frame_delegate.h" |
| 71 #include "chrome_frame/crash_reporting/crash_metrics.h" | 70 #include "chrome_frame/crash_reporting/crash_metrics.h" |
| 72 #include "chrome_frame/html_utils.h" | 71 #include "chrome_frame/html_utils.h" |
| 73 #include "chrome_frame/http_negotiate.h" | 72 #include "chrome_frame/http_negotiate.h" |
| 74 #include "chrome_frame/utils.h" | 73 #include "chrome_frame/utils.h" |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 version += "-F"; | 593 version += "-F"; |
| 595 if (!version_info.IsOfficialBuild()) | 594 if (!version_info.IsOfficialBuild()) |
| 596 version.append("-devel"); | 595 version.append("-devel"); |
| 597 return version; | 596 return version; |
| 598 } else { | 597 } else { |
| 599 NOTREACHED() << "Unable to retrieve version string."; | 598 NOTREACHED() << "Unable to retrieve version string."; |
| 600 } | 599 } |
| 601 | 600 |
| 602 return std::string(); | 601 return std::string(); |
| 603 } | 602 } |
| OLD | NEW |