| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); | 274 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); |
| 275 ChromeVersionService::RegisterUserPrefs(registry); | 275 ChromeVersionService::RegisterUserPrefs(registry); |
| 276 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( | 276 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( |
| 277 registry); | 277 registry); |
| 278 chrome_browser_net::Predictor::RegisterUserPrefs(registry); | 278 chrome_browser_net::Predictor::RegisterUserPrefs(registry); |
| 279 DownloadPrefs::RegisterUserPrefs(registry); | 279 DownloadPrefs::RegisterUserPrefs(registry); |
| 280 extensions::ComponentLoader::RegisterUserPrefs(registry); | 280 extensions::ComponentLoader::RegisterUserPrefs(registry); |
| 281 extensions::ExtensionPrefs::RegisterUserPrefs(registry); | 281 extensions::ExtensionPrefs::RegisterUserPrefs(registry); |
| 282 ExtensionWebUI::RegisterUserPrefs(registry); | 282 ExtensionWebUI::RegisterUserPrefs(registry); |
| 283 first_run::RegisterUserPrefs(registry); | 283 first_run::RegisterUserPrefs(registry); |
| 284 FlagsUI::RegisterUserPrefs(registry); |
| 284 HostContentSettingsMap::RegisterUserPrefs(registry); | 285 HostContentSettingsMap::RegisterUserPrefs(registry); |
| 285 IncognitoModePrefs::RegisterUserPrefs(registry); | 286 IncognitoModePrefs::RegisterUserPrefs(registry); |
| 286 InstantUI::RegisterUserPrefs(registry); | 287 InstantUI::RegisterUserPrefs(registry); |
| 287 browser_sync::InvalidatorStorage::RegisterUserPrefs(registry); | 288 browser_sync::InvalidatorStorage::RegisterUserPrefs(registry); |
| 288 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); | 289 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); |
| 289 MediaStreamDevicesController::RegisterUserPrefs(registry); | 290 MediaStreamDevicesController::RegisterUserPrefs(registry); |
| 290 NetPrefObserver::RegisterUserPrefs(registry); | 291 NetPrefObserver::RegisterUserPrefs(registry); |
| 291 NewTabUI::RegisterUserPrefs(registry); | 292 NewTabUI::RegisterUserPrefs(registry); |
| 292 PasswordManager::RegisterUserPrefs(registry); | 293 PasswordManager::RegisterUserPrefs(registry); |
| 293 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); | 294 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 } | 438 } |
| 438 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 439 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 439 | 440 |
| 440 current_version |= GOOGLE_URL_TRACKER_PREFS; | 441 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 441 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 442 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 442 current_version); | 443 current_version); |
| 443 } | 444 } |
| 444 } | 445 } |
| 445 | 446 |
| 446 } // namespace chrome | 447 } // namespace chrome |
| OLD | NEW |