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

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

Issue 518063002: Settings to control Add Person and Browse as Guest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 771 registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
772 false); 772 false);
773 // This policy needs to be defined before the net subsystem is initialized, 773 // This policy needs to be defined before the net subsystem is initialized,
774 // so we do it here. 774 // so we do it here.
775 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, 775 registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy,
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 registry->RegisterBooleanPref(prefs::kBrowserAddPersonEnabled, true);
781 782
782 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) 783 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS)
783 registry->RegisterBooleanPref(prefs::kEulaAccepted, false); 784 registry->RegisterBooleanPref(prefs::kEulaAccepted, false);
784 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) 785 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS)
785 #if defined(OS_WIN) 786 #if defined(OS_WIN)
786 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { 787 if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
787 registry->RegisterStringPref(prefs::kRelaunchMode, 788 registry->RegisterStringPref(prefs::kRelaunchMode,
788 upgrade_util::kRelaunchModeDefault); 789 upgrade_util::kRelaunchModeDefault);
789 } 790 }
790 #endif 791 #endif
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1212 } 1213 }
1213 1214
1214 void BrowserProcessImpl::OnAutoupdateTimer() { 1215 void BrowserProcessImpl::OnAutoupdateTimer() {
1215 if (CanAutorestartForUpdate()) { 1216 if (CanAutorestartForUpdate()) {
1216 DLOG(WARNING) << "Detected update. Restarting browser."; 1217 DLOG(WARNING) << "Detected update. Restarting browser.";
1217 RestartBackgroundInstance(); 1218 RestartBackgroundInstance();
1218 } 1219 }
1219 } 1220 }
1220 1221
1221 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1222 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698