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 <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
653 // so we do it here. | 653 // so we do it here. |
654 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, | 654 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, |
655 net::kDefaultMaxSocketsPerProxyServer); | 655 net::kDefaultMaxSocketsPerProxyServer); |
656 | 656 |
657 // This is observed by ChildProcessSecurityPolicy, which lives in content/ | 657 // This is observed by ChildProcessSecurityPolicy, which lives in content/ |
658 // though, so it can't register itself. | 658 // though, so it can't register itself. |
659 registry->RegisterListPref(prefs::kDisabledSchemes); | 659 registry->RegisterListPref(prefs::kDisabledSchemes); |
660 | 660 |
661 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); | 661 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); |
662 | 662 |
| 663 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
| 664 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); |
| 665 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
663 #if defined(OS_WIN) | 666 #if defined(OS_WIN) |
664 if (base::win::GetVersion() >= base::win::VERSION_WIN8) | 667 if (base::win::GetVersion() >= base::win::VERSION_WIN8) |
665 registry->RegisterBooleanPref(prefs::kRestartSwitchMode, false); | 668 registry->RegisterBooleanPref(prefs::kRestartSwitchMode, false); |
666 #endif | 669 #endif |
667 | 670 |
668 // TODO(brettw,*): this comment about ResourceBundle was here since | 671 // TODO(brettw,*): this comment about ResourceBundle was here since |
669 // initial commit. This comment seems unrelated, bit-rotten and | 672 // initial commit. This comment seems unrelated, bit-rotten and |
670 // a candidate for removal. | 673 // a candidate for removal. |
671 // Initialize ResourceBundle which handles files loaded from external | 674 // Initialize ResourceBundle which handles files loaded from external |
672 // sources. This has to be done before uninstall code path and before prefs | 675 // sources. This has to be done before uninstall code path and before prefs |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1051 } | 1054 } |
1052 | 1055 |
1053 void BrowserProcessImpl::OnAutoupdateTimer() { | 1056 void BrowserProcessImpl::OnAutoupdateTimer() { |
1054 if (CanAutorestartForUpdate()) { | 1057 if (CanAutorestartForUpdate()) { |
1055 DLOG(WARNING) << "Detected update. Restarting browser."; | 1058 DLOG(WARNING) << "Detected update. Restarting browser."; |
1056 RestartBackgroundInstance(); | 1059 RestartBackgroundInstance(); |
1057 } | 1060 } |
1058 } | 1061 } |
1059 | 1062 |
1060 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1063 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |