| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "chrome/browser/metrics/chrome_metrics_service_client.h" | 9 #include "chrome/browser/metrics/chrome_metrics_service_client.h" |
| 10 #include "chrome/browser/metrics/extensions_metrics_provider.h" | 10 #include "chrome/browser/metrics/extensions_metrics_provider.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 MetricsServicesManager::GetVariationsService() { | 51 MetricsServicesManager::GetVariationsService() { |
| 52 DCHECK(thread_checker_.CalledOnValidThread()); | 52 DCHECK(thread_checker_.CalledOnValidThread()); |
| 53 if (!variations_service_) { | 53 if (!variations_service_) { |
| 54 variations_service_ = | 54 variations_service_ = |
| 55 chrome_variations::VariationsService::Create(local_state_, | 55 chrome_variations::VariationsService::Create(local_state_, |
| 56 GetMetricsStateManager()); | 56 GetMetricsStateManager()); |
| 57 } | 57 } |
| 58 return variations_service_.get(); | 58 return variations_service_.get(); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void MetricsServicesManager::OnPluginLoadingError( | |
| 62 const base::FilePath& plugin_path) { | |
| 63 GetMetricsService()->LogPluginLoadingError(plugin_path); | |
| 64 } | |
| 65 | |
| 66 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() { | 61 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() { |
| 67 DCHECK(thread_checker_.CalledOnValidThread()); | 62 DCHECK(thread_checker_.CalledOnValidThread()); |
| 68 if (!metrics_state_manager_) { | 63 if (!metrics_state_manager_) { |
| 69 metrics_state_manager_ = metrics::MetricsStateManager::Create( | 64 metrics_state_manager_ = metrics::MetricsStateManager::Create( |
| 70 local_state_, | 65 local_state_, |
| 71 base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled, | 66 base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled, |
| 72 base::Unretained(this))); | 67 base::Unretained(this))); |
| 73 } | 68 } |
| 74 return metrics_state_manager_.get(); | 69 return metrics_state_manager_.get(); |
| 75 } | 70 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 87 #if defined(GOOGLE_CHROME_BUILD) | 82 #if defined(GOOGLE_CHROME_BUILD) |
| 88 #if defined(OS_CHROMEOS) | 83 #if defined(OS_CHROMEOS) |
| 89 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, | 84 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, |
| 90 &enabled); | 85 &enabled); |
| 91 #else | 86 #else |
| 92 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled); | 87 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled); |
| 93 #endif // #if defined(OS_CHROMEOS) | 88 #endif // #if defined(OS_CHROMEOS) |
| 94 #endif // defined(GOOGLE_CHROME_BUILD) | 89 #endif // defined(GOOGLE_CHROME_BUILD) |
| 95 return enabled; | 90 return enabled; |
| 96 } | 91 } |
| OLD | NEW |