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

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: 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/extensions_metrics_provider.h" 9 #include "chrome/browser/metrics/extensions_metrics_provider.h"
10 #include "chrome/browser/metrics/metrics_service.h" 10 #include "chrome/browser/metrics/metrics_service.h"
(...skipping 21 matching lines...) Expand all
32 metrics_service_.reset(new MetricsService( 32 metrics_service_.reset(new MetricsService(
33 GetMetricsStateManager(), &metrics_service_client_, local_state_)); 33 GetMetricsStateManager(), &metrics_service_client_, local_state_));
34 metrics_service_client_.set_service(metrics_service_.get()); 34 metrics_service_client_.set_service(metrics_service_.get());
35 metrics_service_->RegisterMetricsProvider( 35 metrics_service_->RegisterMetricsProvider(
36 scoped_ptr<metrics::MetricsProvider>( 36 scoped_ptr<metrics::MetricsProvider>(
37 new ExtensionsMetricsProvider(GetMetricsStateManager()))); 37 new ExtensionsMetricsProvider(GetMetricsStateManager())));
38 } 38 }
39 return metrics_service_.get(); 39 return metrics_service_.get();
40 } 40 }
41 41
42 PluginMetricsProvider* MetricsServicesManager::GetPluginMetricsProvider() {
43 return GetMetricsService()->plugin_metrics_provider();
44 }
45
42 rappor::RapporService* MetricsServicesManager::GetRapporService() { 46 rappor::RapporService* MetricsServicesManager::GetRapporService() {
43 DCHECK(thread_checker_.CalledOnValidThread()); 47 DCHECK(thread_checker_.CalledOnValidThread());
44 if (!rappor_service_) 48 if (!rappor_service_)
45 rappor_service_.reset(new rappor::RapporService); 49 rappor_service_.reset(new rappor::RapporService);
46 return rappor_service_.get(); 50 return rappor_service_.get();
47 } 51 }
48 52
49 chrome_variations::VariationsService* 53 chrome_variations::VariationsService*
50 MetricsServicesManager::GetVariationsService() { 54 MetricsServicesManager::GetVariationsService() {
51 DCHECK(thread_checker_.CalledOnValidThread()); 55 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 29 matching lines...) Expand all
81 #if defined(GOOGLE_CHROME_BUILD) 85 #if defined(GOOGLE_CHROME_BUILD)
82 #if defined(OS_CHROMEOS) 86 #if defined(OS_CHROMEOS)
83 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, 87 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
84 &enabled); 88 &enabled);
85 #else 89 #else
86 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled); 90 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled);
87 #endif // #if defined(OS_CHROMEOS) 91 #endif // #if defined(OS_CHROMEOS)
88 #endif // defined(GOOGLE_CHROME_BUILD) 92 #endif // defined(GOOGLE_CHROME_BUILD)
89 return enabled; 93 return enabled;
90 } 94 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698