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 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { | 760 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { |
761 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 761 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
762 false); | 762 false); |
763 // This policy needs to be defined before the net subsystem is initialized, | 763 // This policy needs to be defined before the net subsystem is initialized, |
764 // so we do it here. | 764 // so we do it here. |
765 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, | 765 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, |
766 net::kDefaultMaxSocketsPerProxyServer); | 766 net::kDefaultMaxSocketsPerProxyServer); |
767 | 767 |
768 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); | 768 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); |
769 | 769 |
| 770 registry->RegisterBooleanPref(prefs::kBrowserGuestModeEnabled, true); |
| 771 |
770 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) | 772 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
771 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); | 773 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); |
772 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) | 774 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
773 #if defined(OS_WIN) | 775 #if defined(OS_WIN) |
774 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { | 776 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
775 registry->RegisterStringPref(prefs::kRelaunchMode, | 777 registry->RegisterStringPref(prefs::kRelaunchMode, |
776 upgrade_util::kRelaunchModeDefault); | 778 upgrade_util::kRelaunchModeDefault); |
777 } | 779 } |
778 #endif | 780 #endif |
779 | 781 |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1195 } | 1197 } |
1196 | 1198 |
1197 void BrowserProcessImpl::OnAutoupdateTimer() { | 1199 void BrowserProcessImpl::OnAutoupdateTimer() { |
1198 if (CanAutorestartForUpdate()) { | 1200 if (CanAutorestartForUpdate()) { |
1199 DLOG(WARNING) << "Detected update. Restarting browser."; | 1201 DLOG(WARNING) << "Detected update. Restarting browser."; |
1200 RestartBackgroundInstance(); | 1202 RestartBackgroundInstance(); |
1201 } | 1203 } |
1202 } | 1204 } |
1203 | 1205 |
1204 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1206 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |