OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/chrome_metrics_services_manager_client.h" | 5 #include "chrome/browser/metrics/chrome_metrics_services_manager_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/feature_list.h" | 8 #include "base/feature_list.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
12 #include "base/task_scheduler/post_task.h" | 12 #include "base/task_scheduler/post_task.h" |
13 #include "build/build_config.h" | |
13 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
14 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 15 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
15 #include "chrome/browser/metrics/chrome_metrics_service_client.h" | 16 #include "chrome/browser/metrics/chrome_metrics_service_client.h" |
16 #include "chrome/browser/metrics/variations/chrome_variations_service_client.h" | 17 #include "chrome/browser/metrics/variations/chrome_variations_service_client.h" |
17 #include "chrome/browser/metrics/variations/ui_string_overrider_factory.h" | 18 #include "chrome/browser/metrics/variations/ui_string_overrider_factory.h" |
19 #include "chrome/browser/ui/browser_list.h" | |
18 #include "chrome/browser/ui/browser_otr_state.h" | 20 #include "chrome/browser/ui/browser_otr_state.h" |
19 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
20 #include "chrome/installer/util/google_update_settings.h" | 22 #include "chrome/installer/util/google_update_settings.h" |
21 #include "components/metrics/enabled_state_provider.h" | 23 #include "components/metrics/enabled_state_provider.h" |
22 #include "components/metrics/metrics_state_manager.h" | 24 #include "components/metrics/metrics_state_manager.h" |
23 #include "components/prefs/pref_service.h" | 25 #include "components/prefs/pref_service.h" |
24 #include "components/rappor/rappor_service_impl.h" | 26 #include "components/rappor/rappor_service_impl.h" |
25 #include "components/variations/service/variations_service.h" | 27 #include "components/variations/service/variations_service.h" |
26 #include "components/variations/variations_associated_data.h" | 28 #include "components/variations/variations_associated_data.h" |
27 #include "components/version_info/version_info.h" | 29 #include "components/version_info/version_info.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
281 base::Bind(&GoogleUpdateSettings::LoadMetricsClientInfo)); | 283 base::Bind(&GoogleUpdateSettings::LoadMetricsClientInfo)); |
282 } | 284 } |
283 return metrics_state_manager_.get(); | 285 return metrics_state_manager_.get(); |
284 } | 286 } |
285 | 287 |
286 bool ChromeMetricsServicesManagerClient::IsMetricsReportingForceEnabled() { | 288 bool ChromeMetricsServicesManagerClient::IsMetricsReportingForceEnabled() { |
287 return ChromeMetricsServiceClient::IsMetricsReportingForceEnabled(); | 289 return ChromeMetricsServiceClient::IsMetricsReportingForceEnabled(); |
288 } | 290 } |
289 | 291 |
290 bool ChromeMetricsServicesManagerClient::IsIncognitoSessionActive() { | 292 bool ChromeMetricsServicesManagerClient::IsIncognitoSessionActive() { |
291 return chrome::IsIncognitoSessionActive(); | 293 #if defined(OS_ANDROID) |
294 // TODO(crbug/739971) On Android, we don't get notifications from TabModel | |
295 // when incognito tabs are opened, so this won't get re-evaluated reliably | |
296 // yet. Assume there always an incognito tab open, which will keep UKM | |
297 // disabled. | |
298 return false; | |
rkaplow
2017/07/07 13:53:41
shouldn't this be true?
Steven Holte
2017/07/07 19:08:41
Yes, fixed.
| |
299 #else | |
300 // Depending directly on BrowserList, since that is the implementation | |
301 // that we get correct notifications for. | |
302 return chrome::BrowserList::IsIncognitoSessionActive(); | |
303 #endif | |
292 } | 304 } |
OLD | NEW |