| 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/apps_promo.h" | |
| 20 #include "chrome/browser/extensions/component_loader.h" | 19 #include "chrome/browser/extensions/component_loader.h" |
| 21 #include "chrome/browser/extensions/extension_prefs.h" | 20 #include "chrome/browser/extensions/extension_prefs.h" |
| 22 #include "chrome/browser/extensions/extension_web_ui.h" | 21 #include "chrome/browser/extensions/extension_web_ui.h" |
| 23 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 22 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 24 #include "chrome/browser/geolocation/geolocation_prefs.h" | 23 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 25 #include "chrome/browser/google/google_url_tracker.h" | 24 #include "chrome/browser/google/google_url_tracker.h" |
| 26 #include "chrome/browser/google/google_url_tracker_factory.h" | 25 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 27 #include "chrome/browser/instant/instant_controller.h" | 26 #include "chrome/browser/instant/instant_controller.h" |
| 28 #include "chrome/browser/intents/web_intents_util.h" | 27 #include "chrome/browser/intents/web_intents_util.h" |
| 29 #include "chrome/browser/intranet_redirect_detector.h" | 28 #include "chrome/browser/intranet_redirect_detector.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 #if defined(ENABLE_TASK_MANAGER) | 138 #if defined(ENABLE_TASK_MANAGER) |
| 140 TaskManager::RegisterPrefs(local_state); | 139 TaskManager::RegisterPrefs(local_state); |
| 141 #endif // defined(ENABLE_TASK_MANAGER) | 140 #endif // defined(ENABLE_TASK_MANAGER) |
| 142 | 141 |
| 143 #if defined(TOOLKIT_VIEWS) | 142 #if defined(TOOLKIT_VIEWS) |
| 144 browser::RegisterBrowserViewPrefs(local_state); | 143 browser::RegisterBrowserViewPrefs(local_state); |
| 145 browser::RegisterTabStripLayoutTypePrefs(local_state); | 144 browser::RegisterTabStripLayoutTypePrefs(local_state); |
| 146 #endif | 145 #endif |
| 147 | 146 |
| 148 #if !defined(OS_ANDROID) | 147 #if !defined(OS_ANDROID) |
| 149 AppsPromo::RegisterPrefs(local_state); | |
| 150 BackgroundModeManager::RegisterPrefs(local_state); | 148 BackgroundModeManager::RegisterPrefs(local_state); |
| 151 Browser::RegisterPrefs(local_state); | 149 Browser::RegisterPrefs(local_state); |
| 152 FlagsUI::RegisterPrefs(local_state); | 150 FlagsUI::RegisterPrefs(local_state); |
| 153 ManagedMode::RegisterPrefs(local_state); | 151 ManagedMode::RegisterPrefs(local_state); |
| 154 PromoResourceService::RegisterPrefs(local_state); | 152 PromoResourceService::RegisterPrefs(local_state); |
| 155 UpgradeDetector::RegisterPrefs(local_state); | 153 UpgradeDetector::RegisterPrefs(local_state); |
| 156 #endif | 154 #endif |
| 157 | 155 |
| 158 #if defined(ENABLE_PRINTING) | 156 #if defined(ENABLE_PRINTING) |
| 159 printing::PrintJobManager::RegisterPrefs(local_state); | 157 printing::PrintJobManager::RegisterPrefs(local_state); |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 | 215 |
| 218 #if defined(OS_ANDROID) | 216 #if defined(OS_ANDROID) |
| 219 geolocation::RegisterUserPrefs(user_prefs); | 217 geolocation::RegisterUserPrefs(user_prefs); |
| 220 #endif | 218 #endif |
| 221 | 219 |
| 222 #if defined(USE_ASH) | 220 #if defined(USE_ASH) |
| 223 ash::RegisterChromeLauncherUserPrefs(user_prefs); | 221 ash::RegisterChromeLauncherUserPrefs(user_prefs); |
| 224 #endif | 222 #endif |
| 225 | 223 |
| 226 #if !defined(OS_ANDROID) | 224 #if !defined(OS_ANDROID) |
| 227 AppsPromo::RegisterUserPrefs(user_prefs); | |
| 228 extensions::CommandService::RegisterUserPrefs(user_prefs); | 225 extensions::CommandService::RegisterUserPrefs(user_prefs); |
| 229 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 226 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
| 230 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 227 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
| 231 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 228 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
| 232 Browser::RegisterUserPrefs(user_prefs); | 229 Browser::RegisterUserPrefs(user_prefs); |
| 233 browser::RegisterAutolaunchPrefs(user_prefs); | 230 browser::RegisterAutolaunchPrefs(user_prefs); |
| 234 DevToolsWindow::RegisterUserPrefs(user_prefs); | 231 DevToolsWindow::RegisterUserPrefs(user_prefs); |
| 235 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); | 232 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); |
| 236 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 233 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
| 237 PluginsUI::RegisterUserPrefs(user_prefs); | 234 PluginsUI::RegisterUserPrefs(user_prefs); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 } | 316 } |
| 320 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 317 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 321 | 318 |
| 322 current_version |= GOOGLE_URL_TRACKER_PREFS; | 319 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 323 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 320 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 324 current_version); | 321 current_version); |
| 325 } | 322 } |
| 326 } | 323 } |
| 327 | 324 |
| 328 } // namespace browser | 325 } // namespace browser |
| OLD | NEW |