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

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: Remove UI element which cause Blink to crash Created 6 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { 767 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
768 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 768 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
769 false); 769 false);
770 // This policy needs to be defined before the net subsystem is initialized, 770 // This policy needs to be defined before the net subsystem is initialized,
771 // so we do it here. 771 // so we do it here.
772 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, 772 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy,
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);
778
777 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) 779 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS)
778 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); 780 registry->RegisterBooleanPref(prefs::kEulaAccepted, false);
779 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) 781 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS)
780 #if defined(OS_WIN) 782 #if defined(OS_WIN)
781 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { 783 if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
782 registry->RegisterStringPref(prefs::kRelaunchMode, 784 registry->RegisterStringPref(prefs::kRelaunchMode,
783 upgrade_util::kRelaunchModeDefault); 785 upgrade_util::kRelaunchModeDefault);
784 } 786 }
785 #endif 787 #endif
786 788
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1203 } 1205 }
1204 1206
1205 void BrowserProcessImpl::OnAutoupdateTimer() { 1207 void BrowserProcessImpl::OnAutoupdateTimer() {
1206 if (CanAutorestartForUpdate()) { 1208 if (CanAutorestartForUpdate()) {
1207 DLOG(WARNING) << "Detected update. Restarting browser."; 1209 DLOG(WARNING) << "Detected update. Restarting browser.";
1208 RestartBackgroundInstance(); 1210 RestartBackgroundInstance();
1209 } 1211 }
1210 } 1212 }
1211 1213
1212 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1214 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698