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