| 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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 void RegisterUserPrefs(PrefService* user_prefs) { | 194 void RegisterUserPrefs(PrefService* user_prefs) { |
| 195 // User prefs | 195 // User prefs |
| 196 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); | 196 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); |
| 197 AutofillManager::RegisterUserPrefs(user_prefs); | 197 AutofillManager::RegisterUserPrefs(user_prefs); |
| 198 bookmark_utils::RegisterUserPrefs(user_prefs); | 198 bookmark_utils::RegisterUserPrefs(user_prefs); |
| 199 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); | 199 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); |
| 200 ChromeVersionService::RegisterUserPrefs(user_prefs); | 200 ChromeVersionService::RegisterUserPrefs(user_prefs); |
| 201 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); | 201 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); |
| 202 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); | 202 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); |
| 203 DownloadPrefs::RegisterUserPrefs(user_prefs); | 203 DownloadPrefs::RegisterUserPrefs(user_prefs); |
| 204 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); |
| 204 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 205 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
| 205 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); | 206 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); |
| 206 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 207 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
| 207 IncognitoModePrefs::RegisterUserPrefs(user_prefs); | 208 IncognitoModePrefs::RegisterUserPrefs(user_prefs); |
| 208 InstantController::RegisterUserPrefs(user_prefs); | 209 InstantController::RegisterUserPrefs(user_prefs); |
| 209 NetPrefObserver::RegisterPrefs(user_prefs); | 210 NetPrefObserver::RegisterPrefs(user_prefs); |
| 210 NewTabUI::RegisterUserPrefs(user_prefs); | 211 NewTabUI::RegisterUserPrefs(user_prefs); |
| 211 PasswordManager::RegisterUserPrefs(user_prefs); | 212 PasswordManager::RegisterUserPrefs(user_prefs); |
| 212 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); | 213 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); |
| 213 PrefsTabHelper::RegisterUserPrefs(user_prefs); | 214 PrefsTabHelper::RegisterUserPrefs(user_prefs); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 235 | 236 |
| 236 #if defined(USE_ASH) | 237 #if defined(USE_ASH) |
| 237 ash::RegisterChromeLauncherUserPrefs(user_prefs); | 238 ash::RegisterChromeLauncherUserPrefs(user_prefs); |
| 238 #endif | 239 #endif |
| 239 | 240 |
| 240 #if !defined(OS_ANDROID) | 241 #if !defined(OS_ANDROID) |
| 241 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); | 242 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); |
| 242 ChromeToMobileService::RegisterUserPrefs(user_prefs); | 243 ChromeToMobileService::RegisterUserPrefs(user_prefs); |
| 243 extensions::CommandService::RegisterUserPrefs(user_prefs); | 244 extensions::CommandService::RegisterUserPrefs(user_prefs); |
| 244 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 245 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
| 245 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); | |
| 246 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 246 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
| 247 RegisterBrowserUserPrefs(user_prefs); | 247 RegisterBrowserUserPrefs(user_prefs); |
| 248 RegisterAutolaunchPrefs(user_prefs); | 248 RegisterAutolaunchPrefs(user_prefs); |
| 249 DevToolsWindow::RegisterUserPrefs(user_prefs); | 249 DevToolsWindow::RegisterUserPrefs(user_prefs); |
| 250 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); | 250 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); |
| 251 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 251 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
| 252 PluginsUI::RegisterUserPrefs(user_prefs); | 252 PluginsUI::RegisterUserPrefs(user_prefs); |
| 253 SyncPromoUI::RegisterUserPrefs(user_prefs); | 253 SyncPromoUI::RegisterUserPrefs(user_prefs); |
| 254 printing::StickySettings::RegisterUserPrefs(user_prefs); | 254 printing::StickySettings::RegisterUserPrefs(user_prefs); |
| 255 #endif | 255 #endif |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 } | 329 } |
| 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 331 | 331 |
| 332 current_version |= GOOGLE_URL_TRACKER_PREFS; | 332 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 334 current_version); | 334 current_version); |
| 335 } | 335 } |
| 336 } | 336 } |
| 337 | 337 |
| 338 } // namespace chrome | 338 } // namespace chrome |
| OLD | NEW |