| 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/autocomplete/zero_suggest_provider.h" |
| 9 #include "chrome/browser/autofill/autofill_manager.h" | 10 #include "chrome/browser/autofill/autofill_manager.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 11 #include "chrome/browser/background/background_mode_manager.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/browser_shutdown.h" | 13 #include "chrome/browser/browser_shutdown.h" |
| 13 #include "chrome/browser/chrome_content_browser_client.h" | 14 #include "chrome/browser/chrome_content_browser_client.h" |
| 14 #include "chrome/browser/content_settings/host_content_settings_map.h" | 15 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 16 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 16 #include "chrome/browser/debugger/devtools_window.h" | 17 #include "chrome/browser/debugger/devtools_window.h" |
| 17 #include "chrome/browser/download/download_prefs.h" | 18 #include "chrome/browser/download/download_prefs.h" |
| 18 #include "chrome/browser/extensions/api/commands/command_service.h" | 19 #include "chrome/browser/extensions/api/commands/command_service.h" |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); | 217 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); |
| 217 PrefsTabHelper::RegisterUserPrefs(user_prefs); | 218 PrefsTabHelper::RegisterUserPrefs(user_prefs); |
| 218 ProfileImpl::RegisterUserPrefs(user_prefs); | 219 ProfileImpl::RegisterUserPrefs(user_prefs); |
| 219 PromoResourceService::RegisterUserPrefs(user_prefs); | 220 PromoResourceService::RegisterUserPrefs(user_prefs); |
| 220 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); | 221 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); |
| 221 RegisterBrowserUserPrefs(user_prefs); | 222 RegisterBrowserUserPrefs(user_prefs); |
| 222 SessionStartupPref::RegisterUserPrefs(user_prefs); | 223 SessionStartupPref::RegisterUserPrefs(user_prefs); |
| 223 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 224 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
| 224 TranslatePrefs::RegisterUserPrefs(user_prefs); | 225 TranslatePrefs::RegisterUserPrefs(user_prefs); |
| 225 web_intents::RegisterUserPrefs(user_prefs); | 226 web_intents::RegisterUserPrefs(user_prefs); |
| 227 ZeroSuggestProvider::RegisterUserPrefs(user_prefs); |
| 226 | 228 |
| 227 #if defined(ENABLE_CONFIGURATION_POLICY) | 229 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 228 policy::URLBlacklistManager::RegisterPrefs(user_prefs); | 230 policy::URLBlacklistManager::RegisterPrefs(user_prefs); |
| 229 #endif | 231 #endif |
| 230 | 232 |
| 231 #if defined(TOOLKIT_VIEWS) | 233 #if defined(TOOLKIT_VIEWS) |
| 232 RegisterInvertBubbleUserPrefs(user_prefs); | 234 RegisterInvertBubbleUserPrefs(user_prefs); |
| 233 #elif defined(TOOLKIT_GTK) | 235 #elif defined(TOOLKIT_GTK) |
| 234 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 236 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 235 #endif | 237 #endif |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 } | 337 } |
| 336 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 338 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 337 | 339 |
| 338 current_version |= GOOGLE_URL_TRACKER_PREFS; | 340 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 339 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 341 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 340 current_version); | 342 current_version); |
| 341 } | 343 } |
| 342 } | 344 } |
| 343 | 345 |
| 344 } // namespace chrome | 346 } // namespace chrome |
| OLD | NEW |