Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 385073008: Browser-based guest policy implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { 736 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
737 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 737 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
738 false); 738 false);
739 // This policy needs to be defined before the net subsystem is initialized, 739 // This policy needs to be defined before the net subsystem is initialized,
740 // so we do it here. 740 // so we do it here.
741 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, 741 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy,
742 net::kDefaultMaxSocketsPerProxyServer); 742 net::kDefaultMaxSocketsPerProxyServer);
743 743
744 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); 744 registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false);
745 745
746 registry->RegisterBooleanPref(prefs::kBrowserGuestModeEnabled, true);
747
746 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) 748 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS)
747 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); 749 registry->RegisterBooleanPref(prefs::kEulaAccepted, false);
748 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) 750 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS)
749 #if defined(OS_WIN) 751 #if defined(OS_WIN)
750 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { 752 if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
751 registry->RegisterStringPref(prefs::kRelaunchMode, 753 registry->RegisterStringPref(prefs::kRelaunchMode,
752 upgrade_util::kRelaunchModeDefault); 754 upgrade_util::kRelaunchModeDefault);
753 } 755 }
754 #endif 756 #endif
755 757
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 } 1173 }
1172 1174
1173 void BrowserProcessImpl::OnAutoupdateTimer() { 1175 void BrowserProcessImpl::OnAutoupdateTimer() {
1174 if (CanAutorestartForUpdate()) { 1176 if (CanAutorestartForUpdate()) {
1175 DLOG(WARNING) << "Detected update. Restarting browser."; 1177 DLOG(WARNING) << "Detected update. Restarting browser.";
1176 RestartBackgroundInstance(); 1178 RestartBackgroundInstance();
1177 } 1179 }
1178 } 1180 }
1179 1181
1180 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1182 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698