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

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

Issue 297483008: Refactor HashedExtensionMetrics into ExtensionsMetricsProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/metrics/metrics_log.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/metrics_service.h" 10 #include "chrome/browser/metrics/metrics_service.h"
10 #include "chrome/browser/metrics/metrics_state_manager.h" 11 #include "chrome/browser/metrics/metrics_state_manager.h"
11 #include "chrome/browser/metrics/variations/variations_service.h" 12 #include "chrome/browser/metrics/variations/variations_service.h"
12 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
13 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
14 #include "components/rappor/rappor_service.h" 15 #include "components/rappor/rappor_service.h"
15 16
16 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
17 #include "chrome/browser/chromeos/settings/cros_settings.h" 18 #include "chrome/browser/chromeos/settings/cros_settings.h"
18 #endif 19 #endif
19 20
20 MetricsServicesManager::MetricsServicesManager(PrefService* local_state) 21 MetricsServicesManager::MetricsServicesManager(PrefService* local_state)
21 : local_state_(local_state) { 22 : local_state_(local_state) {
22 DCHECK(local_state); 23 DCHECK(local_state);
23 } 24 }
24 25
25 MetricsServicesManager::~MetricsServicesManager() { 26 MetricsServicesManager::~MetricsServicesManager() {
26 } 27 }
27 28
28 MetricsService* MetricsServicesManager::GetMetricsService() { 29 MetricsService* MetricsServicesManager::GetMetricsService() {
29 DCHECK(thread_checker_.CalledOnValidThread()); 30 DCHECK(thread_checker_.CalledOnValidThread());
30 if (!metrics_service_) { 31 if (!metrics_service_) {
31 metrics_service_.reset( 32 metrics_service_.reset(
32 new MetricsService(GetMetricsStateManager(), &metrics_service_client_)); 33 new MetricsService(GetMetricsStateManager(), &metrics_service_client_));
33 metrics_service_client_.set_service(metrics_service_.get()); 34 metrics_service_client_.set_service(metrics_service_.get());
35 metrics_service_->RegisterMetricsProvider(
36 scoped_ptr<metrics::MetricsProvider>(
37 new ExtensionsMetricsProvider(GetMetricsStateManager())));
34 } 38 }
35 return metrics_service_.get(); 39 return metrics_service_.get();
36 } 40 }
37 41
38 rappor::RapporService* MetricsServicesManager::GetRapporService() { 42 rappor::RapporService* MetricsServicesManager::GetRapporService() {
39 DCHECK(thread_checker_.CalledOnValidThread()); 43 DCHECK(thread_checker_.CalledOnValidThread());
40 if (!rappor_service_) 44 if (!rappor_service_)
41 rappor_service_.reset(new rappor::RapporService); 45 rappor_service_.reset(new rappor::RapporService);
42 return rappor_service_.get(); 46 return rappor_service_.get();
43 } 47 }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #if defined(GOOGLE_CHROME_BUILD) 81 #if defined(GOOGLE_CHROME_BUILD)
78 #if defined(OS_CHROMEOS) 82 #if defined(OS_CHROMEOS)
79 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, 83 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
80 &enabled); 84 &enabled);
81 #else 85 #else
82 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled); 86 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled);
83 #endif // #if defined(OS_CHROMEOS) 87 #endif // #if defined(OS_CHROMEOS)
84 #endif // defined(GOOGLE_CHROME_BUILD) 88 #endif // defined(GOOGLE_CHROME_BUILD)
85 return enabled; 89 return enabled;
86 } 90 }
OLDNEW
« no previous file with comments | « chrome/browser/metrics/metrics_log.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698