Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser_process_impl.h" | 5 #include "chrome/browser/browser_process_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 839 #endif // defined(OS_CHROMEOS) | 839 #endif // defined(OS_CHROMEOS) |
| 840 | 840 |
| 841 #if defined(ENABLE_REPORTING_BLIMP) | 841 #if defined(ENABLE_REPORTING_BLIMP) |
| 842 // Enables reporting for the (headless) blimp engine. Defined in | 842 // Enables reporting for the (headless) blimp engine. Defined in |
| 843 // components/metrics/BUILD.gn | 843 // components/metrics/BUILD.gn |
| 844 registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, true); | 844 registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, true); |
| 845 #else | 845 #else |
| 846 registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, | 846 registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, |
| 847 GoogleUpdateSettings::GetCollectStatsConsent()); | 847 GoogleUpdateSettings::GetCollectStatsConsent()); |
| 848 #endif // defined(ENABLE_REPORTING_HEADLESS) | 848 #endif // defined(ENABLE_REPORTING_HEADLESS) |
| 849 registry->RegisterDictionaryPref(metrics::prefs::kUserCellDataUse); | |
| 850 registry->RegisterDictionaryPref(metrics::prefs::kUmaCellDataUse); | |
|
Alexei Svitkine (slow)
2016/03/18 22:23:29
Suggest adding a MetricsDataUseMeasurements::Regis
gayane -on leave until 09-2017
2016/03/29 16:06:20
Done.
| |
| 849 | 851 |
| 850 #if BUILDFLAG(ANDROID_JAVA_UI) | 852 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 851 registry->RegisterBooleanPref( | 853 registry->RegisterBooleanPref( |
| 852 prefs::kCrashReportingEnabled, false); | 854 prefs::kCrashReportingEnabled, false); |
| 853 #endif // BUILDFLAG(ANDROID_JAVA_UI) | 855 #endif // BUILDFLAG(ANDROID_JAVA_UI) |
| 854 } | 856 } |
| 855 | 857 |
| 856 DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { | 858 DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { |
| 857 DCHECK(CalledOnValidThread()); | 859 DCHECK(CalledOnValidThread()); |
| 858 if (!download_request_limiter_.get()) | 860 if (!download_request_limiter_.get()) |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1295 } | 1297 } |
| 1296 | 1298 |
| 1297 void BrowserProcessImpl::OnAutoupdateTimer() { | 1299 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1298 if (CanAutorestartForUpdate()) { | 1300 if (CanAutorestartForUpdate()) { |
| 1299 DLOG(WARNING) << "Detected update. Restarting browser."; | 1301 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1300 RestartBackgroundInstance(); | 1302 RestartBackgroundInstance(); |
| 1301 } | 1303 } |
| 1302 } | 1304 } |
| 1303 | 1305 |
| 1304 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1306 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |