| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 829 #if defined(OS_CHROMEOS) | 829 #if defined(OS_CHROMEOS) |
| 830 registry->RegisterStringPref(prefs::kOwnerLocale, std::string()); | 830 registry->RegisterStringPref(prefs::kOwnerLocale, std::string()); |
| 831 registry->RegisterStringPref(prefs::kHardwareKeyboardLayout, | 831 registry->RegisterStringPref(prefs::kHardwareKeyboardLayout, |
| 832 std::string()); | 832 std::string()); |
| 833 #endif // defined(OS_CHROMEOS) | 833 #endif // defined(OS_CHROMEOS) |
| 834 #if !defined(OS_CHROMEOS) | 834 #if !defined(OS_CHROMEOS) |
| 835 registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, | 835 registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, |
| 836 GoogleUpdateSettings::GetCollectStatsConsent()); | 836 GoogleUpdateSettings::GetCollectStatsConsent()); |
| 837 #endif // !defined(OS_CHROMEOS) | 837 #endif // !defined(OS_CHROMEOS) |
| 838 | 838 |
| 839 #if defined(OS_ANDROID) | 839 #if defined(ANDROID_JAVA_UI) |
| 840 registry->RegisterBooleanPref( | 840 registry->RegisterBooleanPref( |
| 841 prefs::kCrashReportingEnabled, false); | 841 prefs::kCrashReportingEnabled, false); |
| 842 #endif // defined(OS_ANDROID) | 842 #endif // defined(ANDROID_JAVA_UI) |
| 843 } | 843 } |
| 844 | 844 |
| 845 DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { | 845 DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { |
| 846 DCHECK(CalledOnValidThread()); | 846 DCHECK(CalledOnValidThread()); |
| 847 if (!download_request_limiter_.get()) | 847 if (!download_request_limiter_.get()) |
| 848 download_request_limiter_ = new DownloadRequestLimiter(); | 848 download_request_limiter_ = new DownloadRequestLimiter(); |
| 849 return download_request_limiter_.get(); | 849 return download_request_limiter_.get(); |
| 850 } | 850 } |
| 851 | 851 |
| 852 BackgroundModeManager* BrowserProcessImpl::background_mode_manager() { | 852 BackgroundModeManager* BrowserProcessImpl::background_mode_manager() { |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1284 } | 1284 } |
| 1285 | 1285 |
| 1286 void BrowserProcessImpl::OnAutoupdateTimer() { | 1286 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1287 if (CanAutorestartForUpdate()) { | 1287 if (CanAutorestartForUpdate()) { |
| 1288 DLOG(WARNING) << "Detected update. Restarting browser."; | 1288 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1289 RestartBackgroundInstance(); | 1289 RestartBackgroundInstance(); |
| 1290 } | 1290 } |
| 1291 } | 1291 } |
| 1292 | 1292 |
| 1293 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1293 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |