| 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 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 907 if (i->typed_count != -1) | 907 if (i->typed_count != -1) |
| 908 suggestion->set_typed_count(i->typed_count); | 908 suggestion->set_typed_count(i->typed_count); |
| 909 suggestion->set_is_starred(i->starred); | 909 suggestion->set_is_starred(i->starred); |
| 910 } | 910 } |
| 911 for (ProvidersInfo::const_iterator i(log.providers_info.begin()); | 911 for (ProvidersInfo::const_iterator i(log.providers_info.begin()); |
| 912 i != log.providers_info.end(); ++i) { | 912 i != log.providers_info.end(); ++i) { |
| 913 OmniboxEventProto::ProviderInfo* provider_info = | 913 OmniboxEventProto::ProviderInfo* provider_info = |
| 914 omnibox_event->add_provider_info(); | 914 omnibox_event->add_provider_info(); |
| 915 provider_info->CopyFrom(*i); | 915 provider_info->CopyFrom(*i); |
| 916 } | 916 } |
| 917 | |
| 918 ++num_events_; | |
| 919 } | 917 } |
| 920 | 918 |
| 921 void MetricsLog::WriteGoogleUpdateProto( | 919 void MetricsLog::WriteGoogleUpdateProto( |
| 922 const GoogleUpdateMetrics& google_update_metrics) { | 920 const GoogleUpdateMetrics& google_update_metrics) { |
| 923 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) | 921 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) |
| 924 SystemProfileProto::GoogleUpdate* google_update = | 922 SystemProfileProto::GoogleUpdate* google_update = |
| 925 uma_proto()->mutable_system_profile()->mutable_google_update(); | 923 uma_proto()->mutable_system_profile()->mutable_google_update(); |
| 926 | 924 |
| 927 google_update->set_is_system_install(google_update_metrics.is_system_install); | 925 google_update->set_is_system_install(google_update_metrics.is_system_install); |
| 928 | 926 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 940 ProductDataToProto(google_update_metrics.google_update_data, | 938 ProductDataToProto(google_update_metrics.google_update_data, |
| 941 google_update->mutable_google_update_status()); | 939 google_update->mutable_google_update_status()); |
| 942 } | 940 } |
| 943 | 941 |
| 944 if (!google_update_metrics.product_data.version.empty()) { | 942 if (!google_update_metrics.product_data.version.empty()) { |
| 945 ProductDataToProto(google_update_metrics.product_data, | 943 ProductDataToProto(google_update_metrics.product_data, |
| 946 google_update->mutable_client_status()); | 944 google_update->mutable_client_status()); |
| 947 } | 945 } |
| 948 #endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) | 946 #endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) |
| 949 } | 947 } |
| OLD | NEW |