OLD | NEW |
---|---|
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/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/background_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
191 #endif | 191 #endif |
192 InstantController::RegisterUserPrefs(user_prefs); | 192 InstantController::RegisterUserPrefs(user_prefs); |
193 NetPrefObserver::RegisterPrefs(user_prefs); | 193 NetPrefObserver::RegisterPrefs(user_prefs); |
194 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); | 194 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); |
195 #if defined(OS_MACOSX) | 195 #if defined(OS_MACOSX) |
196 PresentationModePrefs::RegisterUserPrefs(user_prefs); | 196 PresentationModePrefs::RegisterUserPrefs(user_prefs); |
197 #endif | 197 #endif |
198 #if defined(ENABLE_CONFIGURATION_POLICY) | 198 #if defined(ENABLE_CONFIGURATION_POLICY) |
199 policy::URLBlacklistManager::RegisterPrefs(user_prefs); | 199 policy::URLBlacklistManager::RegisterPrefs(user_prefs); |
200 #endif | 200 #endif |
201 SyncPromoUI::RegisterUserPrefs(user_prefs); | |
202 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); | 201 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); |
203 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); | 202 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); |
204 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 203 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
205 default_apps::RegisterUserPrefs(user_prefs); | 204 default_apps::RegisterUserPrefs(user_prefs); |
206 #endif | 205 #endif |
207 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 206 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
208 web_intents::RegisterUserPrefs(user_prefs); | 207 web_intents::RegisterUserPrefs(user_prefs); |
209 #if defined(USE_AURA) | 208 #if defined(USE_AURA) |
210 ChromeLauncherDelegate::RegisterUserPrefs(user_prefs); | 209 ChromeLauncherDelegate::RegisterUserPrefs(user_prefs); |
211 #endif | 210 #endif |
212 #if !defined(OS_ANDROID) | 211 #if !defined(OS_ANDROID) |
212 SyncPromoUI::RegisterUserPrefs(user_prefs); | |
Yaron
2012/02/29 00:02:17
I think this is merged in from Jesse's change.
| |
213 PluginsUI::RegisterUserPrefs(user_prefs); | 213 PluginsUI::RegisterUserPrefs(user_prefs); |
214 PromoResourceService::RegisterUserPrefs(user_prefs); | 214 PromoResourceService::RegisterUserPrefs(user_prefs); |
215 #endif | 215 #endif |
216 } | 216 } |
217 | 217 |
218 void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) { | 218 void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) { |
219 // Copy pref values which have been migrated to user_prefs from local_state, | 219 // Copy pref values which have been migrated to user_prefs from local_state, |
220 // or remove them from local_state outright, if copying is not required. | 220 // or remove them from local_state outright, if copying is not required. |
221 int current_version = | 221 int current_version = |
222 local_state->GetInteger(prefs::kMultipleProfilePrefMigration); | 222 local_state->GetInteger(prefs::kMultipleProfilePrefMigration); |
(...skipping 16 matching lines...) Expand all Loading... | |
239 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 239 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
240 } | 240 } |
241 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 241 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
242 | 242 |
243 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 243 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
244 current_version | WINDOWS_PREFS); | 244 current_version | WINDOWS_PREFS); |
245 } | 245 } |
246 } | 246 } |
247 | 247 |
248 } // namespace browser | 248 } // namespace browser |
OLD | NEW |