| 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" |
| 11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/browser_shutdown.h" | 12 #include "chrome/browser/browser_shutdown.h" |
| 13 #include "chrome/browser/chrome_content_browser_client.h" | 13 #include "chrome/browser/chrome_content_browser_client.h" |
| 14 #include "chrome/browser/content_settings/host_content_settings_map.h" | 14 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 16 #include "chrome/browser/debugger/devtools_window.h" | 16 #include "chrome/browser/debugger/devtools_window.h" |
| 17 #include "chrome/browser/download/download_prefs.h" | 17 #include "chrome/browser/download/download_prefs.h" |
| 18 #include "chrome/browser/extensions/api/commands/command_service.h" | 18 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 19 #include "chrome/browser/extensions/api/tabs/tabs.h" | 19 #include "chrome/browser/extensions/api/tabs/tabs.h" |
| 20 #include "chrome/browser/extensions/apps_promo.h" | |
| 21 #include "chrome/browser/extensions/component_loader.h" | 20 #include "chrome/browser/extensions/component_loader.h" |
| 22 #include "chrome/browser/extensions/extension_prefs.h" | 21 #include "chrome/browser/extensions/extension_prefs.h" |
| 23 #include "chrome/browser/extensions/extension_web_ui.h" | 22 #include "chrome/browser/extensions/extension_web_ui.h" |
| 24 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 23 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 25 #include "chrome/browser/geolocation/geolocation_prefs.h" | 24 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 26 #include "chrome/browser/google/google_url_tracker.h" | 25 #include "chrome/browser/google/google_url_tracker.h" |
| 27 #include "chrome/browser/google/google_url_tracker_factory.h" | 26 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 28 #include "chrome/browser/instant/instant_controller.h" | 27 #include "chrome/browser/instant/instant_controller.h" |
| 29 #include "chrome/browser/intents/web_intents_util.h" | 28 #include "chrome/browser/intents/web_intents_util.h" |
| 30 #include "chrome/browser/intranet_redirect_detector.h" | 29 #include "chrome/browser/intranet_redirect_detector.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 TaskManager::RegisterPrefs(local_state); | 157 TaskManager::RegisterPrefs(local_state); |
| 159 #endif // defined(ENABLE_TASK_MANAGER) | 158 #endif // defined(ENABLE_TASK_MANAGER) |
| 160 | 159 |
| 161 #if defined(TOOLKIT_VIEWS) | 160 #if defined(TOOLKIT_VIEWS) |
| 162 RegisterBrowserViewPrefs(local_state); | 161 RegisterBrowserViewPrefs(local_state); |
| 163 RegisterTabStripLayoutTypePrefs(local_state); | 162 RegisterTabStripLayoutTypePrefs(local_state); |
| 164 #endif | 163 #endif |
| 165 | 164 |
| 166 PromoResourceService::RegisterPrefs(local_state); | 165 PromoResourceService::RegisterPrefs(local_state); |
| 167 #if !defined(OS_ANDROID) | 166 #if !defined(OS_ANDROID) |
| 168 AppsPromo::RegisterPrefs(local_state); | |
| 169 BackgroundModeManager::RegisterPrefs(local_state); | 167 BackgroundModeManager::RegisterPrefs(local_state); |
| 170 RegisterBrowserPrefs(local_state); | 168 RegisterBrowserPrefs(local_state); |
| 171 FlagsUI::RegisterPrefs(local_state); | 169 FlagsUI::RegisterPrefs(local_state); |
| 172 ManagedMode::RegisterPrefs(local_state); | 170 ManagedMode::RegisterPrefs(local_state); |
| 173 UpgradeDetector::RegisterPrefs(local_state); | 171 UpgradeDetector::RegisterPrefs(local_state); |
| 174 #endif | 172 #endif |
| 175 | 173 |
| 176 #if defined(OS_CHROMEOS) | 174 #if defined(OS_CHROMEOS) |
| 177 chromeos::AudioHandler::RegisterPrefs(local_state); | 175 chromeos::AudioHandler::RegisterPrefs(local_state); |
| 178 chromeos::language_prefs::RegisterPrefs(local_state); | 176 chromeos::language_prefs::RegisterPrefs(local_state); |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 | 231 |
| 234 #if defined(OS_ANDROID) | 232 #if defined(OS_ANDROID) |
| 235 geolocation::RegisterUserPrefs(user_prefs); | 233 geolocation::RegisterUserPrefs(user_prefs); |
| 236 #endif | 234 #endif |
| 237 | 235 |
| 238 #if defined(USE_ASH) | 236 #if defined(USE_ASH) |
| 239 ash::RegisterChromeLauncherUserPrefs(user_prefs); | 237 ash::RegisterChromeLauncherUserPrefs(user_prefs); |
| 240 #endif | 238 #endif |
| 241 | 239 |
| 242 #if !defined(OS_ANDROID) | 240 #if !defined(OS_ANDROID) |
| 243 AppsPromo::RegisterUserPrefs(user_prefs); | |
| 244 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); | 241 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); |
| 245 ChromeToMobileService::RegisterUserPrefs(user_prefs); | 242 ChromeToMobileService::RegisterUserPrefs(user_prefs); |
| 246 extensions::CommandService::RegisterUserPrefs(user_prefs); | 243 extensions::CommandService::RegisterUserPrefs(user_prefs); |
| 247 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 244 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
| 248 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); | 245 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); |
| 249 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 246 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
| 250 RegisterBrowserUserPrefs(user_prefs); | 247 RegisterBrowserUserPrefs(user_prefs); |
| 251 RegisterAutolaunchPrefs(user_prefs); | 248 RegisterAutolaunchPrefs(user_prefs); |
| 252 DevToolsWindow::RegisterUserPrefs(user_prefs); | 249 DevToolsWindow::RegisterUserPrefs(user_prefs); |
| 253 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); | 250 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 } | 329 } |
| 333 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 334 | 331 |
| 335 current_version |= GOOGLE_URL_TRACKER_PREFS; | 332 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 336 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 337 current_version); | 334 current_version); |
| 338 } | 335 } |
| 339 } | 336 } |
| 340 | 337 |
| 341 } // namespace chrome | 338 } // namespace chrome |
| OLD | NEW |