| 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/autofill/autofill_manager.h" | 8 #include "chrome/browser/autofill/autofill_manager.h" |
| 9 #include "chrome/browser/background/background_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 #include "chrome/browser/policy/url_blacklist_manager.h" | 39 #include "chrome/browser/policy/url_blacklist_manager.h" |
| 40 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 40 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 41 #include "chrome/browser/prefs/session_startup_pref.h" | 41 #include "chrome/browser/prefs/session_startup_pref.h" |
| 42 #include "chrome/browser/printing/print_job_manager.h" | 42 #include "chrome/browser/printing/print_job_manager.h" |
| 43 #include "chrome/browser/profiles/chrome_version_service.h" | 43 #include "chrome/browser/profiles/chrome_version_service.h" |
| 44 #include "chrome/browser/profiles/gaia_info_update_service.h" | 44 #include "chrome/browser/profiles/gaia_info_update_service.h" |
| 45 #include "chrome/browser/profiles/profile_impl.h" | 45 #include "chrome/browser/profiles/profile_impl.h" |
| 46 #include "chrome/browser/profiles/profile_info_cache.h" | 46 #include "chrome/browser/profiles/profile_info_cache.h" |
| 47 #include "chrome/browser/profiles/profile_manager.h" | 47 #include "chrome/browser/profiles/profile_manager.h" |
| 48 #include "chrome/browser/renderer_host/web_cache_manager.h" | 48 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 49 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | |
| 50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 49 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 51 #include "chrome/browser/tabs/pinned_tab_codec.h" | 50 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 52 #include "chrome/browser/task_manager/task_manager.h" | 51 #include "chrome/browser/task_manager/task_manager.h" |
| 53 #include "chrome/browser/translate/translate_prefs.h" | 52 #include "chrome/browser/translate/translate_prefs.h" |
| 54 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 53 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
| 55 #include "chrome/browser/ui/browser.h" | 54 #include "chrome/browser/ui/browser.h" |
| 56 #include "chrome/browser/ui/browser_init.h" | 55 #include "chrome/browser/ui/browser_init.h" |
| 57 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 56 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 58 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 57 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 59 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 58 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 WebCacheManager::RegisterPrefs(local_state); | 122 WebCacheManager::RegisterPrefs(local_state); |
| 124 | 123 |
| 125 #if defined(ENABLE_CONFIGURATION_POLICY) | 124 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 126 policy::CloudPolicySubsystem::RegisterPrefs(local_state); | 125 policy::CloudPolicySubsystem::RegisterPrefs(local_state); |
| 127 #endif | 126 #endif |
| 128 | 127 |
| 129 #if defined(ENABLE_NOTIFICATIONS) | 128 #if defined(ENABLE_NOTIFICATIONS) |
| 130 NotificationPrefsManager::RegisterPrefs(local_state); | 129 NotificationPrefsManager::RegisterPrefs(local_state); |
| 131 #endif | 130 #endif |
| 132 | 131 |
| 133 #if defined(ENABLE_SAFE_BROWSING) | |
| 134 SafeBrowsingService::RegisterPrefs(local_state); | |
| 135 #endif | |
| 136 | |
| 137 #if defined(ENABLE_TASK_MANAGER) | 132 #if defined(ENABLE_TASK_MANAGER) |
| 138 TaskManager::RegisterPrefs(local_state); | 133 TaskManager::RegisterPrefs(local_state); |
| 139 #endif // defined(ENABLE_TASK_MANAGER) | 134 #endif // defined(ENABLE_TASK_MANAGER) |
| 140 | 135 |
| 141 #if defined(TOOLKIT_VIEWS) | 136 #if defined(TOOLKIT_VIEWS) |
| 142 BrowserView::RegisterBrowserViewPrefs(local_state); | 137 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 143 #endif | 138 #endif |
| 144 | 139 |
| 145 #if !defined(OS_ANDROID) | 140 #if !defined(OS_ANDROID) |
| 146 BackgroundModeManager::RegisterPrefs(local_state); | 141 BackgroundModeManager::RegisterPrefs(local_state); |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } | 277 } |
| 283 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 278 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 284 | 279 |
| 285 current_version |= WINDOWS_PREFS; | 280 current_version |= WINDOWS_PREFS; |
| 286 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 281 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 287 current_version); | 282 current_version); |
| 288 } | 283 } |
| 289 } | 284 } |
| 290 | 285 |
| 291 } // namespace browser | 286 } // namespace browser |
| OLD | NEW |