| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_services_manager.h" | 5 #include "chrome/browser/metrics/metrics_services_manager.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
| 12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
| 13 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 13 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 14 #include "chrome/browser/metrics/chrome_metrics_service_client.h" | 14 #include "chrome/browser/metrics/chrome_metrics_service_client.h" |
| 15 #include "chrome/browser/metrics/metrics_reporting_state.h" | 15 #include "chrome/browser/metrics/metrics_reporting_state.h" |
| 16 #include "chrome/browser/metrics/variations/chrome_variations_service_client.h" | 16 #include "chrome/browser/metrics/variations/chrome_variations_service_client.h" |
| 17 #include "chrome/browser/metrics/variations/generated_resources_map.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/profiles/profile_manager.h" | 19 #include "chrome/browser/profiles/profile_manager.h" |
| 19 #include "chrome/browser/ui/browser_otr_state.h" | 20 #include "chrome/browser/ui/browser_otr_state.h" |
| 20 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
| 22 #include "chrome/installer/util/google_update_settings.h" | 23 #include "chrome/installer/util/google_update_settings.h" |
| 23 #include "components/metrics/metrics_service.h" | 24 #include "components/metrics/metrics_service.h" |
| 24 #include "components/metrics/metrics_state_manager.h" | 25 #include "components/metrics/metrics_state_manager.h" |
| 25 #include "components/rappor/rappor_service.h" | 26 #include "components/rappor/rappor_service.h" |
| 26 #include "components/variations/service/variations_service.h" | 27 #include "components/variations/service/variations_service.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 rappor_service_->Initialize(g_browser_process->system_request_context()); | 61 rappor_service_->Initialize(g_browser_process->system_request_context()); |
| 61 } | 62 } |
| 62 return rappor_service_.get(); | 63 return rappor_service_.get(); |
| 63 } | 64 } |
| 64 | 65 |
| 65 variations::VariationsService* MetricsServicesManager::GetVariationsService() { | 66 variations::VariationsService* MetricsServicesManager::GetVariationsService() { |
| 66 DCHECK(thread_checker_.CalledOnValidThread()); | 67 DCHECK(thread_checker_.CalledOnValidThread()); |
| 67 if (!variations_service_) { | 68 if (!variations_service_) { |
| 68 variations_service_ = variations::VariationsService::Create( | 69 variations_service_ = variations::VariationsService::Create( |
| 69 make_scoped_ptr(new ChromeVariationsServiceClient()), local_state_, | 70 make_scoped_ptr(new ChromeVariationsServiceClient()), local_state_, |
| 70 GetMetricsStateManager(), switches::kDisableBackgroundNetworking); | 71 GetMetricsStateManager(), switches::kDisableBackgroundNetworking, |
| 72 variations::UIStringOverrider( |
| 73 chrome_variations::kResourceHashes, |
| 74 chrome_variations::kResourceIndices, |
| 75 chrome_variations::kNumResources)); |
| 71 } | 76 } |
| 72 return variations_service_.get(); | 77 return variations_service_.get(); |
| 73 } | 78 } |
| 74 | 79 |
| 75 void MetricsServicesManager::OnPluginLoadingError( | 80 void MetricsServicesManager::OnPluginLoadingError( |
| 76 const base::FilePath& plugin_path) { | 81 const base::FilePath& plugin_path) { |
| 77 GetChromeMetricsServiceClient()->LogPluginLoadingError(plugin_path); | 82 GetChromeMetricsServiceClient()->LogPluginLoadingError(plugin_path); |
| 78 } | 83 } |
| 79 | 84 |
| 80 ChromeMetricsServiceClient* | 85 ChromeMetricsServiceClient* |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 recording_groups |= rappor::SAFEBROWSING_RAPPOR_GROUP; | 171 recording_groups |= rappor::SAFEBROWSING_RAPPOR_GROUP; |
| 167 #endif // defined(GOOGLE_CHROME_BUILD) | 172 #endif // defined(GOOGLE_CHROME_BUILD) |
| 168 GetRapporService()->Update(recording_groups, may_upload_); | 173 GetRapporService()->Update(recording_groups, may_upload_); |
| 169 } | 174 } |
| 170 | 175 |
| 171 void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) { | 176 void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) { |
| 172 return UpdatePermissions( | 177 return UpdatePermissions( |
| 173 ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(), | 178 ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(), |
| 174 may_upload); | 179 may_upload); |
| 175 } | 180 } |
| OLD | NEW |