| 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 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { | 775 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { |
| 776 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 776 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
| 777 false); | 777 false); |
| 778 // This policy needs to be defined before the net subsystem is initialized, | 778 // This policy needs to be defined before the net subsystem is initialized, |
| 779 // so we do it here. | 779 // so we do it here. |
| 780 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, | 780 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, |
| 781 net::kDefaultMaxSocketsPerProxyServer); | 781 net::kDefaultMaxSocketsPerProxyServer); |
| 782 | 782 |
| 783 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); | 783 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); |
| 784 | 784 |
| 785 registry->RegisterBooleanPref(prefs::kBrowserGuestModeEnabled, true); | |
| 786 | |
| 787 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) | 785 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
| 788 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); | 786 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); |
| 789 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) | 787 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
| 790 #if defined(OS_WIN) | 788 #if defined(OS_WIN) |
| 791 if (base::win::GetVersion() >= base::win::VERSION_WIN7) { | 789 if (base::win::GetVersion() >= base::win::VERSION_WIN7) { |
| 792 registry->RegisterStringPref(prefs::kRelaunchMode, | 790 registry->RegisterStringPref(prefs::kRelaunchMode, |
| 793 upgrade_util::kRelaunchModeDefault); | 791 upgrade_util::kRelaunchModeDefault); |
| 794 } | 792 } |
| 795 #endif | 793 #endif |
| 796 | 794 |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1217 } | 1215 } |
| 1218 | 1216 |
| 1219 void BrowserProcessImpl::OnAutoupdateTimer() { | 1217 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1220 if (CanAutorestartForUpdate()) { | 1218 if (CanAutorestartForUpdate()) { |
| 1221 DLOG(WARNING) << "Detected update. Restarting browser."; | 1219 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1222 RestartBackgroundInstance(); | 1220 RestartBackgroundInstance(); |
| 1223 } | 1221 } |
| 1224 } | 1222 } |
| 1225 | 1223 |
| 1226 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1224 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |