| 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 15 matching lines...) Expand all Loading... |
| 26 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 26 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 27 #include "chrome/browser/extensions/component_loader.h" | 27 #include "chrome/browser/extensions/component_loader.h" |
| 28 #include "chrome/browser/extensions/extension_prefs.h" | 28 #include "chrome/browser/extensions/extension_prefs.h" |
| 29 #include "chrome/browser/extensions/extension_web_ui.h" | 29 #include "chrome/browser/extensions/extension_web_ui.h" |
| 30 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 30 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 31 #include "chrome/browser/first_run/first_run.h" | 31 #include "chrome/browser/first_run/first_run.h" |
| 32 #include "chrome/browser/geolocation/geolocation_prefs.h" | 32 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 33 #include "chrome/browser/google/google_url_tracker.h" | 33 #include "chrome/browser/google/google_url_tracker.h" |
| 34 #include "chrome/browser/google/google_url_tracker_factory.h" | 34 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 35 #include "chrome/browser/gpu/gl_string_manager.h" | 35 #include "chrome/browser/gpu/gl_string_manager.h" |
| 36 #include "chrome/browser/gpu/gpu_mode_manager.h" |
| 36 #include "chrome/browser/intranet_redirect_detector.h" | 37 #include "chrome/browser/intranet_redirect_detector.h" |
| 37 #include "chrome/browser/io_thread.h" | 38 #include "chrome/browser/io_thread.h" |
| 38 #include "chrome/browser/managed_mode/managed_mode.h" | 39 #include "chrome/browser/managed_mode/managed_mode.h" |
| 39 #include "chrome/browser/managed_mode/managed_user_service.h" | 40 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 40 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 41 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 41 #include "chrome/browser/media/media_stream_devices_controller.h" | 42 #include "chrome/browser/media/media_stream_devices_controller.h" |
| 42 #include "chrome/browser/metrics/metrics_log.h" | 43 #include "chrome/browser/metrics/metrics_log.h" |
| 43 #include "chrome/browser/metrics/metrics_service.h" | 44 #include "chrome/browser/metrics/metrics_service.h" |
| 44 #include "chrome/browser/metrics/variations/variations_service.h" | 45 #include "chrome/browser/metrics/variations/variations_service.h" |
| 45 #include "chrome/browser/net/http_server_properties_manager.h" | 46 #include "chrome/browser/net/http_server_properties_manager.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 // Please keep this list alphabetized. | 177 // Please keep this list alphabetized. |
| 177 AppListService::RegisterPrefs(registry); | 178 AppListService::RegisterPrefs(registry); |
| 178 apps::RegisterPrefs(registry); | 179 apps::RegisterPrefs(registry); |
| 179 browser_shutdown::RegisterPrefs(registry); | 180 browser_shutdown::RegisterPrefs(registry); |
| 180 BrowserProcessImpl::RegisterPrefs(registry); | 181 BrowserProcessImpl::RegisterPrefs(registry); |
| 181 chrome::RegisterScreenshotPrefs(registry); | 182 chrome::RegisterScreenshotPrefs(registry); |
| 182 ExternalProtocolHandler::RegisterPrefs(registry); | 183 ExternalProtocolHandler::RegisterPrefs(registry); |
| 183 FlagsUI::RegisterPrefs(registry); | 184 FlagsUI::RegisterPrefs(registry); |
| 184 geolocation::RegisterPrefs(registry); | 185 geolocation::RegisterPrefs(registry); |
| 185 GLStringManager::RegisterPrefs(registry); | 186 GLStringManager::RegisterPrefs(registry); |
| 187 GpuModeManager::RegisterPrefs(registry); |
| 186 IntranetRedirectDetector::RegisterPrefs(registry); | 188 IntranetRedirectDetector::RegisterPrefs(registry); |
| 187 IOThread::RegisterPrefs(registry); | 189 IOThread::RegisterPrefs(registry); |
| 188 KeywordEditorController::RegisterPrefs(registry); | 190 KeywordEditorController::RegisterPrefs(registry); |
| 189 MetricsLog::RegisterPrefs(registry); | 191 MetricsLog::RegisterPrefs(registry); |
| 190 MetricsService::RegisterPrefs(registry); | 192 MetricsService::RegisterPrefs(registry); |
| 191 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); | 193 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); |
| 192 ProfileInfoCache::RegisterPrefs(registry); | 194 ProfileInfoCache::RegisterPrefs(registry); |
| 193 ProfileManager::RegisterPrefs(registry); | 195 ProfileManager::RegisterPrefs(registry); |
| 194 PromoResourceService::RegisterPrefs(registry); | 196 PromoResourceService::RegisterPrefs(registry); |
| 195 RegisterPrefsForRecoveryComponent(registry); | 197 RegisterPrefsForRecoveryComponent(registry); |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 } | 435 } |
| 434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 436 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 435 | 437 |
| 436 current_version |= GOOGLE_URL_TRACKER_PREFS; | 438 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 439 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 438 current_version); | 440 current_version); |
| 439 } | 441 } |
| 440 } | 442 } |
| 441 | 443 |
| 442 } // namespace chrome | 444 } // namespace chrome |
| OLD | NEW |