| 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 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { | 673 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { |
| 674 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 674 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
| 675 false); | 675 false); |
| 676 // This policy needs to be defined before the net subsystem is initialized, | 676 // This policy needs to be defined before the net subsystem is initialized, |
| 677 // so we do it here. | 677 // so we do it here. |
| 678 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, | 678 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, |
| 679 net::kDefaultMaxSocketsPerProxyServer); | 679 net::kDefaultMaxSocketsPerProxyServer); |
| 680 | 680 |
| 681 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); | 681 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); |
| 682 | 682 |
| 683 registry->RegisterBooleanPref(prefs::kBrowserGuestModeEnabled, true); |
| 684 |
| 683 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) | 685 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
| 684 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); | 686 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); |
| 685 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) | 687 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
| 686 #if defined(OS_WIN) | 688 #if defined(OS_WIN) |
| 687 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { | 689 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
| 688 registry->RegisterStringPref(prefs::kRelaunchMode, | 690 registry->RegisterStringPref(prefs::kRelaunchMode, |
| 689 upgrade_util::kRelaunchModeDefault); | 691 upgrade_util::kRelaunchModeDefault); |
| 690 } | 692 } |
| 691 #endif | 693 #endif |
| 692 | 694 |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1108 } | 1110 } |
| 1109 | 1111 |
| 1110 void BrowserProcessImpl::OnAutoupdateTimer() { | 1112 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1111 if (CanAutorestartForUpdate()) { | 1113 if (CanAutorestartForUpdate()) { |
| 1112 DLOG(WARNING) << "Detected update. Restarting browser."; | 1114 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1113 RestartBackgroundInstance(); | 1115 RestartBackgroundInstance(); |
| 1114 } | 1116 } |
| 1115 } | 1117 } |
| 1116 | 1118 |
| 1117 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1119 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |