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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
13 #include "chrome/browser/metrics/chrome_metrics_service_client.h" | 13 #include "chrome/browser/metrics/chrome_metrics_service_client.h" |
14 #include "chrome/browser/metrics/variations/variations_service.h" | 14 #include "chrome/browser/metrics/variations/variations_service.h" |
15 #include "chrome/browser/ui/browser_otr_state.h" | 15 #include "chrome/browser/ui/browser_otr_state.h" |
16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
18 #include "chrome/installer/util/google_update_settings.h" | 18 #include "chrome/installer/util/google_update_settings.h" |
19 #include "components/metrics/metrics_service.h" | 19 #include "components/metrics/metrics_service.h" |
20 #include "components/metrics/metrics_state_manager.h" | 20 #include "components/metrics/metrics_state_manager.h" |
21 #include "components/rappor/rappor_service.h" | 21 #include "components/rappor/rappor_service.h" |
22 #include "content/public/browser/browser_thread.h" | |
22 | 23 |
23 #if defined(OS_CHROMEOS) | 24 #if defined(OS_CHROMEOS) |
24 #include "chrome/browser/chromeos/settings/cros_settings.h" | 25 #include "chrome/browser/chromeos/settings/cros_settings.h" |
25 #endif | 26 #endif |
26 | 27 |
28 // Posts StoreMetricsClientInfo on IO thread. | |
Alexei Svitkine (slow)
2015/02/09 16:48:05
IO thread doesn't play into this. The current code
gayane -on leave until 09-2017
2015/02/09 19:09:23
Done.
| |
29 void PostStoreMetricsClientInfo(const metrics::ClientInfo& client_info) { | |
30 content::BrowserThread::PostTask( | |
31 content::BrowserThread::FILE, FROM_HERE, | |
Alexei Svitkine (slow)
2015/02/09 16:48:05
It's better to use the worker pool for this.
i.e.
gayane -on leave until 09-2017
2015/02/09 19:09:23
Done.
| |
32 base::Bind(&GoogleUpdateSettings::StoreMetricsClientInfo, client_info)); | |
33 } | |
34 | |
27 MetricsServicesManager::MetricsServicesManager(PrefService* local_state) | 35 MetricsServicesManager::MetricsServicesManager(PrefService* local_state) |
28 : local_state_(local_state) { | 36 : local_state_(local_state) { |
29 DCHECK(local_state); | 37 DCHECK(local_state); |
30 } | 38 } |
31 | 39 |
32 MetricsServicesManager::~MetricsServicesManager() { | 40 MetricsServicesManager::~MetricsServicesManager() { |
33 } | 41 } |
34 | 42 |
35 metrics::MetricsService* MetricsServicesManager::GetMetricsService() { | 43 metrics::MetricsService* MetricsServicesManager::GetMetricsService() { |
36 DCHECK(thread_checker_.CalledOnValidThread()); | 44 DCHECK(thread_checker_.CalledOnValidThread()); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
73 return metrics_service_client_.get(); | 81 return metrics_service_client_.get(); |
74 } | 82 } |
75 | 83 |
76 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() { | 84 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() { |
77 DCHECK(thread_checker_.CalledOnValidThread()); | 85 DCHECK(thread_checker_.CalledOnValidThread()); |
78 if (!metrics_state_manager_) { | 86 if (!metrics_state_manager_) { |
79 metrics_state_manager_ = metrics::MetricsStateManager::Create( | 87 metrics_state_manager_ = metrics::MetricsStateManager::Create( |
80 local_state_, | 88 local_state_, |
81 base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled, | 89 base::Bind(&MetricsServicesManager::IsMetricsReportingEnabled, |
82 base::Unretained(this)), | 90 base::Unretained(this)), |
83 base::Bind(&GoogleUpdateSettings::StoreMetricsClientInfo), | 91 base::Bind(&PostStoreMetricsClientInfo), |
84 base::Bind(&GoogleUpdateSettings::LoadMetricsClientInfo)); | 92 base::Bind(&GoogleUpdateSettings::LoadMetricsClientInfo)); |
85 } | 93 } |
86 return metrics_state_manager_.get(); | 94 return metrics_state_manager_.get(); |
87 } | 95 } |
88 | 96 |
89 void MetricsServicesManager::UpdatePermissions(bool may_record, | 97 void MetricsServicesManager::UpdatePermissions(bool may_record, |
90 bool may_upload) { | 98 bool may_upload) { |
91 metrics::MetricsService* metrics = GetMetricsService(); | 99 metrics::MetricsService* metrics = GetMetricsService(); |
92 | 100 |
93 const base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); | 101 const base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
133 #if defined(GOOGLE_CHROME_BUILD) | 141 #if defined(GOOGLE_CHROME_BUILD) |
134 #if defined(OS_CHROMEOS) | 142 #if defined(OS_CHROMEOS) |
135 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, | 143 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, |
136 &enabled); | 144 &enabled); |
137 #else | 145 #else |
138 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled); | 146 enabled = local_state_->GetBoolean(prefs::kMetricsReportingEnabled); |
139 #endif // #if defined(OS_CHROMEOS) | 147 #endif // #if defined(OS_CHROMEOS) |
140 #endif // defined(GOOGLE_CHROME_BUILD) | 148 #endif // defined(GOOGLE_CHROME_BUILD) |
141 return enabled; | 149 return enabled; |
142 } | 150 } |
OLD | NEW |