| 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/autocomplete/zero_suggest_provider.h" |
| 10 #include "chrome/browser/autofill/autofill_manager.h" | 10 #include "chrome/browser/autofill/autofill_manager.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "chrome/browser/metrics/variations/variations_service.h" | 34 #include "chrome/browser/metrics/variations/variations_service.h" |
| 35 #include "chrome/browser/net/http_server_properties_manager.h" | 35 #include "chrome/browser/net/http_server_properties_manager.h" |
| 36 #include "chrome/browser/net/net_pref_observer.h" | 36 #include "chrome/browser/net/net_pref_observer.h" |
| 37 #include "chrome/browser/net/predictor.h" | 37 #include "chrome/browser/net/predictor.h" |
| 38 #include "chrome/browser/net/ssl_config_service_manager.h" | 38 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 39 #include "chrome/browser/notifications/desktop_notification_service.h" | 39 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 40 #include "chrome/browser/notifications/notification_prefs_manager.h" | 40 #include "chrome/browser/notifications/notification_prefs_manager.h" |
| 41 #include "chrome/browser/page_info_model.h" | 41 #include "chrome/browser/page_info_model.h" |
| 42 #include "chrome/browser/password_manager/password_manager.h" | 42 #include "chrome/browser/password_manager/password_manager.h" |
| 43 #include "chrome/browser/pepper_flash_settings_manager.h" | 43 #include "chrome/browser/pepper_flash_settings_manager.h" |
| 44 #include "chrome/browser/policy/cloud_policy_subsystem.h" | |
| 45 #include "chrome/browser/policy/url_blacklist_manager.h" | |
| 46 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 44 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 47 #include "chrome/browser/prefs/pref_service.h" | 45 #include "chrome/browser/prefs/pref_service.h" |
| 48 #include "chrome/browser/prefs/session_startup_pref.h" | 46 #include "chrome/browser/prefs/session_startup_pref.h" |
| 49 #include "chrome/browser/profiles/chrome_version_service.h" | 47 #include "chrome/browser/profiles/chrome_version_service.h" |
| 50 #include "chrome/browser/profiles/gaia_info_update_service.h" | 48 #include "chrome/browser/profiles/gaia_info_update_service.h" |
| 51 #include "chrome/browser/profiles/profile_impl.h" | 49 #include "chrome/browser/profiles/profile_impl.h" |
| 52 #include "chrome/browser/profiles/profile_info_cache.h" | 50 #include "chrome/browser/profiles/profile_info_cache.h" |
| 53 #include "chrome/browser/profiles/profile_manager.h" | 51 #include "chrome/browser/profiles/profile_manager.h" |
| 54 #include "chrome/browser/renderer_host/web_cache_manager.h" | 52 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 55 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 53 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 66 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 69 #include "chrome/browser/ui/webui/plugins_ui.h" | 67 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 70 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 68 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 71 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 69 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
| 72 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 70 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
| 73 #include "chrome/browser/upgrade_detector.h" | 71 #include "chrome/browser/upgrade_detector.h" |
| 74 #include "chrome/browser/web_resource/promo_resource_service.h" | 72 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 75 #include "chrome/common/pref_names.h" | 73 #include "chrome/common/pref_names.h" |
| 76 #include "content/public/browser/render_process_host.h" | 74 #include "content/public/browser/render_process_host.h" |
| 77 | 75 |
| 76 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 77 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
| 78 #include "chrome/browser/policy/policy_statistics_collector.h" |
| 79 #include "chrome/browser/policy/url_blacklist_manager.h" |
| 80 #endif |
| 81 |
| 78 #if defined(OS_MACOSX) | 82 #if defined(OS_MACOSX) |
| 79 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 83 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 80 #endif | 84 #endif |
| 81 | 85 |
| 82 #if defined(TOOLKIT_VIEWS) | 86 #if defined(TOOLKIT_VIEWS) |
| 83 #include "chrome/browser/ui/browser_view_prefs.h" | 87 #include "chrome/browser/ui/browser_view_prefs.h" |
| 84 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" | 88 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" |
| 85 #endif | 89 #endif |
| 86 | 90 |
| 87 #if defined(TOOLKIT_GTK) | 91 #if defined(TOOLKIT_GTK) |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 ProfileInfoCache::RegisterPrefs(local_state); | 148 ProfileInfoCache::RegisterPrefs(local_state); |
| 145 ProfileManager::RegisterPrefs(local_state); | 149 ProfileManager::RegisterPrefs(local_state); |
| 146 SigninManagerFactory::RegisterPrefs(local_state); | 150 SigninManagerFactory::RegisterPrefs(local_state); |
| 147 SSLConfigServiceManager::RegisterPrefs(local_state); | 151 SSLConfigServiceManager::RegisterPrefs(local_state); |
| 148 chrome_variations::VariationsService::RegisterPrefs(local_state); | 152 chrome_variations::VariationsService::RegisterPrefs(local_state); |
| 149 WebCacheManager::RegisterPrefs(local_state); | 153 WebCacheManager::RegisterPrefs(local_state); |
| 150 chrome::RegisterScreenshotPrefs(local_state); | 154 chrome::RegisterScreenshotPrefs(local_state); |
| 151 | 155 |
| 152 #if defined(ENABLE_CONFIGURATION_POLICY) | 156 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 153 policy::CloudPolicySubsystem::RegisterPrefs(local_state); | 157 policy::CloudPolicySubsystem::RegisterPrefs(local_state); |
| 158 policy::PolicyStatisticsCollector::RegisterPrefs(local_state); |
| 154 #endif | 159 #endif |
| 155 | 160 |
| 156 #if defined(ENABLE_NOTIFICATIONS) | 161 #if defined(ENABLE_NOTIFICATIONS) |
| 157 NotificationPrefsManager::RegisterPrefs(local_state); | 162 NotificationPrefsManager::RegisterPrefs(local_state); |
| 158 #endif | 163 #endif |
| 159 | 164 |
| 160 #if defined(ENABLE_TASK_MANAGER) | 165 #if defined(ENABLE_TASK_MANAGER) |
| 161 TaskManager::RegisterPrefs(local_state); | 166 TaskManager::RegisterPrefs(local_state); |
| 162 #endif // defined(ENABLE_TASK_MANAGER) | 167 #endif // defined(ENABLE_TASK_MANAGER) |
| 163 | 168 |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 } | 342 } |
| 338 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 343 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 339 | 344 |
| 340 current_version |= GOOGLE_URL_TRACKER_PREFS; | 345 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 341 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 346 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 342 current_version); | 347 current_version); |
| 343 } | 348 } |
| 344 } | 349 } |
| 345 | 350 |
| 346 } // namespace chrome | 351 } // namespace chrome |
| OLD | NEW |