| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "chrome/browser/metrics/metrics_log.h" | 5 #include "chrome/browser/metrics/metrics_log.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "chrome/browser/autocomplete/autocomplete_match.h" | 29 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 30 #include "chrome/browser/autocomplete/autocomplete_provider.h" | 30 #include "chrome/browser/autocomplete/autocomplete_provider.h" |
| 31 #include "chrome/browser/autocomplete/autocomplete_result.h" | 31 #include "chrome/browser/autocomplete/autocomplete_result.h" |
| 32 #include "chrome/browser/browser_process.h" | 32 #include "chrome/browser/browser_process.h" |
| 33 #include "chrome/browser/google/google_util.h" | 33 #include "chrome/browser/google/google_util.h" |
| 34 #include "chrome/browser/metrics/extension_metrics.h" | 34 #include "chrome/browser/metrics/extension_metrics.h" |
| 35 #include "chrome/browser/omnibox/omnibox_log.h" | 35 #include "chrome/browser/omnibox/omnibox_log.h" |
| 36 #include "chrome/browser/plugins/plugin_prefs.h" | 36 #include "chrome/browser/plugins/plugin_prefs.h" |
| 37 #include "chrome/browser/profiles/profile_manager.h" | 37 #include "chrome/browser/profiles/profile_manager.h" |
| 38 #include "chrome/common/chrome_version_info.h" | 38 #include "chrome/common/chrome_version_info.h" |
| 39 #include "chrome/common/logging_chrome.h" | |
| 40 #include "chrome/common/metrics/variations/variations_util.h" | 39 #include "chrome/common/metrics/variations/variations_util.h" |
| 41 #include "chrome/common/pref_names.h" | 40 #include "chrome/common/pref_names.h" |
| 42 #include "chrome/installer/util/google_update_settings.h" | 41 #include "chrome/installer/util/google_update_settings.h" |
| 43 #include "components/metrics/proto/omnibox_event.pb.h" | 42 #include "components/metrics/proto/omnibox_event.pb.h" |
| 44 #include "components/metrics/proto/profiler_event.pb.h" | 43 #include "components/metrics/proto/profiler_event.pb.h" |
| 45 #include "components/metrics/proto/system_profile.pb.h" | 44 #include "components/metrics/proto/system_profile.pb.h" |
| 46 #include "components/nacl/common/nacl_process_type.h" | 45 #include "components/nacl/common/nacl_process_type.h" |
| 47 #include "content/public/browser/gpu_data_manager.h" | 46 #include "content/public/browser/gpu_data_manager.h" |
| 48 #include "content/public/common/content_client.h" | 47 #include "content/public/common/content_client.h" |
| 49 #include "content/public/common/webplugininfo.h" | 48 #include "content/public/common/webplugininfo.h" |
| (...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 941 ProductDataToProto(google_update_metrics.google_update_data, | 940 ProductDataToProto(google_update_metrics.google_update_data, |
| 942 google_update->mutable_google_update_status()); | 941 google_update->mutable_google_update_status()); |
| 943 } | 942 } |
| 944 | 943 |
| 945 if (!google_update_metrics.product_data.version.empty()) { | 944 if (!google_update_metrics.product_data.version.empty()) { |
| 946 ProductDataToProto(google_update_metrics.product_data, | 945 ProductDataToProto(google_update_metrics.product_data, |
| 947 google_update->mutable_client_status()); | 946 google_update->mutable_client_status()); |
| 948 } | 947 } |
| 949 #endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) | 948 #endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) |
| 950 } | 949 } |
| OLD | NEW |