Chromium Code Reviews| 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/accessibility/invert_bubble_prefs.h" | 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 232 #endif | 232 #endif |
| 233 | 233 |
| 234 #if defined(OS_ANDROID) | 234 #if defined(OS_ANDROID) |
| 235 geolocation::RegisterUserPrefs(user_prefs); | 235 geolocation::RegisterUserPrefs(user_prefs); |
| 236 #endif | 236 #endif |
| 237 | 237 |
| 238 #if defined(USE_ASH) | 238 #if defined(USE_ASH) |
| 239 ash::RegisterChromeLauncherUserPrefs(user_prefs); | 239 ash::RegisterChromeLauncherUserPrefs(user_prefs); |
| 240 #endif | 240 #endif |
| 241 | 241 |
| 242 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); | |
|
akalin
2012/08/07 00:49:05
out of curiosity, where exactly is this needed? i
nilesh
2012/08/07 16:42:16
extensions::ExtensionSystem::Get() causes Extensio
nilesh
2012/08/07 17:10:43
Tommy, please move this up with the default ones.
| |
| 243 | |
| 242 #if !defined(OS_ANDROID) | 244 #if !defined(OS_ANDROID) |
| 243 AppsPromo::RegisterUserPrefs(user_prefs); | 245 AppsPromo::RegisterUserPrefs(user_prefs); |
| 244 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); | 246 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); |
| 245 ChromeToMobileService::RegisterUserPrefs(user_prefs); | 247 ChromeToMobileService::RegisterUserPrefs(user_prefs); |
| 246 extensions::CommandService::RegisterUserPrefs(user_prefs); | 248 extensions::CommandService::RegisterUserPrefs(user_prefs); |
| 247 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 249 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
| 248 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); | |
| 249 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 250 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
| 250 RegisterBrowserUserPrefs(user_prefs); | 251 RegisterBrowserUserPrefs(user_prefs); |
| 251 RegisterAutolaunchPrefs(user_prefs); | 252 RegisterAutolaunchPrefs(user_prefs); |
| 252 DevToolsWindow::RegisterUserPrefs(user_prefs); | 253 DevToolsWindow::RegisterUserPrefs(user_prefs); |
| 253 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); | 254 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); |
| 254 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 255 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
| 255 PluginsUI::RegisterUserPrefs(user_prefs); | 256 PluginsUI::RegisterUserPrefs(user_prefs); |
| 256 SyncPromoUI::RegisterUserPrefs(user_prefs); | 257 SyncPromoUI::RegisterUserPrefs(user_prefs); |
| 257 printing::StickySettings::RegisterUserPrefs(user_prefs); | 258 printing::StickySettings::RegisterUserPrefs(user_prefs); |
| 258 #endif | 259 #endif |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 332 } | 333 } |
| 333 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 334 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 334 | 335 |
| 335 current_version |= GOOGLE_URL_TRACKER_PREFS; | 336 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 336 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 337 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 337 current_version); | 338 current_version); |
| 338 } | 339 } |
| 339 } | 340 } |
| 340 | 341 |
| 341 } // namespace chrome | 342 } // namespace chrome |
| OLD | NEW |