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 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
776 net::kDefaultMaxSocketsPerProxyServer); | 776 net::kDefaultMaxSocketsPerProxyServer); |
777 | 777 |
778 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); | 778 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); |
779 | 779 |
780 registry->RegisterBooleanPref(prefs::kBrowserGuestModeEnabled, true); | 780 registry->RegisterBooleanPref(prefs::kBrowserGuestModeEnabled, true); |
781 | 781 |
782 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) | 782 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
783 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); | 783 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); |
784 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) | 784 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) |
785 #if defined(OS_WIN) | 785 #if defined(OS_WIN) |
786 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { | 786 if (base::win::GetVersion() >= base::win::VERSION_WIN7) { |
787 registry->RegisterStringPref(prefs::kRelaunchMode, | 787 registry->RegisterStringPref(prefs::kRelaunchMode, |
788 upgrade_util::kRelaunchModeDefault); | 788 upgrade_util::kRelaunchModeDefault); |
789 } | 789 } |
790 #endif | 790 #endif |
791 | 791 |
792 // TODO(brettw,*): this comment about ResourceBundle was here since | 792 // TODO(brettw,*): this comment about ResourceBundle was here since |
793 // initial commit. This comment seems unrelated, bit-rotten and | 793 // initial commit. This comment seems unrelated, bit-rotten and |
794 // a candidate for removal. | 794 // a candidate for removal. |
795 // Initialize ResourceBundle which handles files loaded from external | 795 // Initialize ResourceBundle which handles files loaded from external |
796 // sources. This has to be done before uninstall code path and before prefs | 796 // sources. This has to be done before uninstall code path and before prefs |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1212 } | 1212 } |
1213 | 1213 |
1214 void BrowserProcessImpl::OnAutoupdateTimer() { | 1214 void BrowserProcessImpl::OnAutoupdateTimer() { |
1215 if (CanAutorestartForUpdate()) { | 1215 if (CanAutorestartForUpdate()) { |
1216 DLOG(WARNING) << "Detected update. Restarting browser."; | 1216 DLOG(WARNING) << "Detected update. Restarting browser."; |
1217 RestartBackgroundInstance(); | 1217 RestartBackgroundInstance(); |
1218 } | 1218 } |
1219 } | 1219 } |
1220 | 1220 |
1221 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1221 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |