Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Side by Side Diff: chrome/browser/metrics/metrics_services_manager.cc

Issue 308433004: Reduce plugin_metrics_provider_ usage in MetricsService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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
61 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() { 66 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() {
62 DCHECK(thread_checker_.CalledOnValidThread()); 67 DCHECK(thread_checker_.CalledOnValidThread());
63 if (!metrics_state_manager_) { 68 if (!metrics_state_manager_) {
64 metrics_state_manager_ = metrics::MetricsStateManager::Create( 69 metrics_state_manager_ = metrics::MetricsStateManager::Create(
65 local_state_, 70 local_state_,
66 base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled, 71 base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled,
67 base::Unretained(this))); 72 base::Unretained(this)));
68 } 73 }
69 return metrics_state_manager_.get(); 74 return metrics_state_manager_.get();
70 } 75 }
(...skipping 11 matching lines...) Expand all
82 #if defined(GOOGLE_CHROME_BUILD) 87 #if defined(GOOGLE_CHROME_BUILD)
83 #if defined(OS_CHROMEOS) 88 #if defined(OS_CHROMEOS)
84 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, 89 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
85 &enabled); 90 &enabled);
86 #else 91 #else
87 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled); 92 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled);
88 #endif // #if defined(OS_CHROMEOS) 93 #endif // #if defined(OS_CHROMEOS)
89 #endif // defined(GOOGLE_CHROME_BUILD) 94 #endif // defined(GOOGLE_CHROME_BUILD)
90 return enabled; 95 return enabled;
91 } 96 }
OLDNEW
« no previous file with comments | « chrome/browser/metrics/metrics_services_manager.h ('k') | chrome/browser/metrics/plugin_metrics_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698