OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/prefs/browser_prefs.h" | 5 #include "chrome/browser/prefs/browser_prefs.h" |
6 | 6 |
7 #include "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
8 #include "chrome/browser/autofill/autofill_manager.h" | 8 #include "chrome/browser/autofill/autofill_manager.h" |
9 #include "chrome/browser/background_contents_service.h" | 9 #include "chrome/browser/background_contents_service.h" |
10 #include "chrome/browser/background_mode_manager.h" | 10 #include "chrome/browser/background_mode_manager.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 #include "chrome/browser/chromeos/login/user_manager.h" | 71 #include "chrome/browser/chromeos/login/user_manager.h" |
72 #include "chrome/browser/chromeos/login/wizard_controller.h" | 72 #include "chrome/browser/chromeos/login/wizard_controller.h" |
73 #include "chrome/browser/chromeos/preferences.h" | 73 #include "chrome/browser/chromeos/preferences.h" |
74 #include "chrome/browser/chromeos/status/input_method_menu.h" | 74 #include "chrome/browser/chromeos/status/input_method_menu.h" |
75 #include "chrome/browser/chromeos/user_cros_settings_provider.h" | 75 #include "chrome/browser/chromeos/user_cros_settings_provider.h" |
76 #endif | 76 #endif |
77 | 77 |
78 namespace browser { | 78 namespace browser { |
79 | 79 |
80 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { | 80 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { |
81 RegisterLocalState(local_state); | 81 if (local_state) |
82 RegisterUserPrefs(user_prefs); | 82 RegisterLocalState(local_state); |
| 83 if (user_prefs) |
| 84 RegisterUserPrefs(user_prefs); |
83 } | 85 } |
84 | 86 |
85 void RegisterLocalState(PrefService* local_state) { | 87 void RegisterLocalState(PrefService* local_state) { |
86 // Prefs in Local State | 88 // Prefs in Local State |
87 Browser::RegisterPrefs(local_state); | 89 Browser::RegisterPrefs(local_state); |
88 FlagsUI::RegisterPrefs(local_state); | 90 FlagsUI::RegisterPrefs(local_state); |
89 WebCacheManager::RegisterPrefs(local_state); | 91 WebCacheManager::RegisterPrefs(local_state); |
90 ExternalProtocolHandler::RegisterPrefs(local_state); | 92 ExternalProtocolHandler::RegisterPrefs(local_state); |
91 GoogleURLTracker::RegisterPrefs(local_state); | 93 GoogleURLTracker::RegisterPrefs(local_state); |
92 IntranetRedirectDetector::RegisterPrefs(local_state); | 94 IntranetRedirectDetector::RegisterPrefs(local_state); |
93 KeywordEditorController::RegisterPrefs(local_state); | 95 KeywordEditorController::RegisterPrefs(local_state); |
94 MetricsLog::RegisterPrefs(local_state); | 96 MetricsLog::RegisterPrefs(local_state); |
95 MetricsService::RegisterPrefs(local_state); | 97 MetricsService::RegisterPrefs(local_state); |
96 SafeBrowsingService::RegisterPrefs(local_state); | 98 SafeBrowsingService::RegisterPrefs(local_state); |
97 browser_shutdown::RegisterPrefs(local_state); | 99 browser_shutdown::RegisterPrefs(local_state); |
98 #if defined(TOOLKIT_VIEWS) | 100 #if defined(TOOLKIT_VIEWS) |
99 BrowserView::RegisterBrowserViewPrefs(local_state); | 101 BrowserView::RegisterBrowserViewPrefs(local_state); |
100 #endif | 102 #endif |
101 UpgradeDetector::RegisterPrefs(local_state); | 103 UpgradeDetector::RegisterPrefs(local_state); |
102 TaskManager::RegisterPrefs(local_state); | 104 TaskManager::RegisterPrefs(local_state); |
103 geolocation::RegisterPrefs(local_state); | 105 geolocation::RegisterPrefs(local_state); |
104 AutoFillManager::RegisterBrowserPrefs(local_state); | 106 AutoFillManager::RegisterBrowserPrefs(local_state); |
105 BackgroundPageTracker::RegisterPrefs(local_state); | 107 BackgroundPageTracker::RegisterPrefs(local_state); |
106 NotificationUIManager::RegisterPrefs(local_state); | 108 NotificationUIManager::RegisterPrefs(local_state); |
| 109 PrefProxyConfigService::RegisterUserPrefs(local_state); |
107 #if defined(OS_CHROMEOS) | 110 #if defined(OS_CHROMEOS) |
108 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); | 111 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); |
109 chromeos::UserManager::RegisterPrefs(local_state); | 112 chromeos::UserManager::RegisterPrefs(local_state); |
110 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); | 113 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); |
111 WizardController::RegisterPrefs(local_state); | 114 WizardController::RegisterPrefs(local_state); |
112 chromeos::InputMethodMenu::RegisterPrefs(local_state); | 115 chromeos::InputMethodMenu::RegisterPrefs(local_state); |
113 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); | 116 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); |
114 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); | 117 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); |
115 #endif | 118 #endif |
116 } | 119 } |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 GetValue()->DeepCopy())); | 184 GetValue()->DeepCopy())); |
182 } | 185 } |
183 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 186 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
184 | 187 |
185 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 188 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
186 current_version | WINDOWS_PREFS); | 189 current_version | WINDOWS_PREFS); |
187 } | 190 } |
188 } | 191 } |
189 | 192 |
190 } // namespace browser | 193 } // namespace browser |
OLD | NEW |