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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 6292017: Extended: Add "system" URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 9 years, 10 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/io_thread.cc ('K') | « chrome/browser/notifications/desktop_notifications_unittest.cc ('k') | chrome/browser/ui/cocoa/options/preferences_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ba65eb9e142b16022a4cc65d9bd832d36d9b65bf..b81f3043975b341ec68ae7077f703700a83371b9 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -78,8 +78,10 @@
namespace browser {
void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
- RegisterLocalState(local_state);
- RegisterUserPrefs(user_prefs);
+ if (local_state)
+ RegisterLocalState(local_state);
+ if (user_prefs)
+ RegisterUserPrefs(user_prefs);
}
void RegisterLocalState(PrefService* local_state) {
@@ -104,6 +106,7 @@ void RegisterLocalState(PrefService* local_state) {
AutoFillManager::RegisterBrowserPrefs(local_state);
BackgroundPageTracker::RegisterPrefs(local_state);
NotificationUIManager::RegisterPrefs(local_state);
+ PrefProxyConfigService::RegisterUserPrefs(local_state);
#if defined(OS_CHROMEOS)
chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
chromeos::UserManager::RegisterPrefs(local_state);
« chrome/browser/io_thread.cc ('K') | « chrome/browser/notifications/desktop_notifications_unittest.cc ('k') | chrome/browser/ui/cocoa/options/preferences_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698