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

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

Issue 284293003: [Metrics] Make MetricsStateManager take a callback param to check if UMA is enabled. (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
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 "chrome/browser/metrics/metrics_service.h" 8 #include "chrome/browser/metrics/metrics_service.h"
8 #include "chrome/browser/metrics/metrics_state_manager.h" 9 #include "chrome/browser/metrics/metrics_state_manager.h"
9 #include "chrome/browser/metrics/variations/variations_service.h" 10 #include "chrome/browser/metrics/variations/variations_service.h"
11 #include "chrome/common/chrome_switches.h"
12 #include "chrome/common/pref_names.h"
10 #include "components/rappor/rappor_service.h" 13 #include "components/rappor/rappor_service.h"
11 14
15 #if defined(OS_CHROMEOS)
16 #include "chrome/browser/chromeos/settings/cros_settings.h"
17 #endif
18
12 MetricsServicesManager::MetricsServicesManager(PrefService* local_state) 19 MetricsServicesManager::MetricsServicesManager(PrefService* local_state)
13 : local_state_(local_state) { 20 : local_state_(local_state) {
14 DCHECK(local_state); 21 DCHECK(local_state);
15 } 22 }
16 23
17 MetricsServicesManager::~MetricsServicesManager() { 24 MetricsServicesManager::~MetricsServicesManager() {
18 } 25 }
19 26
20 MetricsService* MetricsServicesManager::GetMetricsService() { 27 MetricsService* MetricsServicesManager::GetMetricsService() {
21 DCHECK(thread_checker_.CalledOnValidThread()); 28 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 15 matching lines...) Expand all
37 if (!variations_service_) { 44 if (!variations_service_) {
38 variations_service_ = 45 variations_service_ =
39 chrome_variations::VariationsService::Create(local_state_, 46 chrome_variations::VariationsService::Create(local_state_,
40 GetMetricsStateManager()); 47 GetMetricsStateManager());
41 } 48 }
42 return variations_service_.get(); 49 return variations_service_.get();
43 } 50 }
44 51
45 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() { 52 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() {
46 DCHECK(thread_checker_.CalledOnValidThread()); 53 DCHECK(thread_checker_.CalledOnValidThread());
47 if (!metrics_state_manager_) 54 if (!metrics_state_manager_) {
48 metrics_state_manager_ = metrics::MetricsStateManager::Create(local_state_); 55 metrics_state_manager_ = metrics::MetricsStateManager::Create(
56 local_state_,
57 base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled,
58 base::Unretained(this)));
59 }
49 return metrics_state_manager_.get(); 60 return metrics_state_manager_.get();
50 } 61 }
62
63 // TODO(asvitkine): This function does not report the correct value on Android,
64 // see http://crbug.com/362192.
65 bool MetricsServicesManager::IsMetricsReportingEnabled() const {
66 // If the user permits metrics reporting with the checkbox in the
67 // prefs, we turn on recording. We disable metrics completely for
68 // non-official builds, or when field trials are forced.
69 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceFieldTrials))
70 return false;
71
72 bool enabled = false;
73 #if defined(GOOGLE_CHROME_BUILD)
74 #if defined(OS_CHROMEOS)
75 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
76 &enabled);
77 #else
78 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled);
79 #endif // #if defined(OS_CHROMEOS)
80 #endif // defined(GOOGLE_CHROME_BUILD)
81 return enabled;
82 }
OLDNEW
« no previous file with comments | « chrome/browser/metrics/metrics_services_manager.h ('k') | chrome/browser/metrics/metrics_state_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698