Chromium Code Reviews| 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 24 matching lines...) Expand all Loading... | |
| 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" | 44 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
| 45 #include "chrome/browser/policy/policy_statistics_collector.h" | |
| 45 #include "chrome/browser/policy/url_blacklist_manager.h" | 46 #include "chrome/browser/policy/url_blacklist_manager.h" |
|
Joao da Silva
2012/09/18 11:49:34
These 3 headers should be within #ifdef ENABLE_CON
qfel
2012/09/18 13:50:06
Done.
| |
| 46 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 47 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 47 #include "chrome/browser/prefs/pref_service.h" | 48 #include "chrome/browser/prefs/pref_service.h" |
| 48 #include "chrome/browser/prefs/session_startup_pref.h" | 49 #include "chrome/browser/prefs/session_startup_pref.h" |
| 49 #include "chrome/browser/profiles/chrome_version_service.h" | 50 #include "chrome/browser/profiles/chrome_version_service.h" |
| 50 #include "chrome/browser/profiles/gaia_info_update_service.h" | 51 #include "chrome/browser/profiles/gaia_info_update_service.h" |
| 51 #include "chrome/browser/profiles/profile_impl.h" | 52 #include "chrome/browser/profiles/profile_impl.h" |
| 52 #include "chrome/browser/profiles/profile_info_cache.h" | 53 #include "chrome/browser/profiles/profile_info_cache.h" |
| 53 #include "chrome/browser/profiles/profile_manager.h" | 54 #include "chrome/browser/profiles/profile_manager.h" |
| 54 #include "chrome/browser/renderer_host/web_cache_manager.h" | 55 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 55 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 56 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 144 ProfileInfoCache::RegisterPrefs(local_state); | 145 ProfileInfoCache::RegisterPrefs(local_state); |
| 145 ProfileManager::RegisterPrefs(local_state); | 146 ProfileManager::RegisterPrefs(local_state); |
| 146 SigninManagerFactory::RegisterPrefs(local_state); | 147 SigninManagerFactory::RegisterPrefs(local_state); |
| 147 SSLConfigServiceManager::RegisterPrefs(local_state); | 148 SSLConfigServiceManager::RegisterPrefs(local_state); |
| 148 chrome_variations::VariationsService::RegisterPrefs(local_state); | 149 chrome_variations::VariationsService::RegisterPrefs(local_state); |
| 149 WebCacheManager::RegisterPrefs(local_state); | 150 WebCacheManager::RegisterPrefs(local_state); |
| 150 chrome::RegisterScreenshotPrefs(local_state); | 151 chrome::RegisterScreenshotPrefs(local_state); |
| 151 | 152 |
| 152 #if defined(ENABLE_CONFIGURATION_POLICY) | 153 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 153 policy::CloudPolicySubsystem::RegisterPrefs(local_state); | 154 policy::CloudPolicySubsystem::RegisterPrefs(local_state); |
| 155 policy::PolicyStatisticsCollector::RegisterPrefs(local_state); | |
| 154 #endif | 156 #endif |
| 155 | 157 |
| 156 #if defined(ENABLE_NOTIFICATIONS) | 158 #if defined(ENABLE_NOTIFICATIONS) |
| 157 NotificationPrefsManager::RegisterPrefs(local_state); | 159 NotificationPrefsManager::RegisterPrefs(local_state); |
| 158 #endif | 160 #endif |
| 159 | 161 |
| 160 #if defined(ENABLE_TASK_MANAGER) | 162 #if defined(ENABLE_TASK_MANAGER) |
| 161 TaskManager::RegisterPrefs(local_state); | 163 TaskManager::RegisterPrefs(local_state); |
| 162 #endif // defined(ENABLE_TASK_MANAGER) | 164 #endif // defined(ENABLE_TASK_MANAGER) |
| 163 | 165 |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 337 } | 339 } |
| 338 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 340 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 339 | 341 |
| 340 current_version |= GOOGLE_URL_TRACKER_PREFS; | 342 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 341 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 343 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 342 current_version); | 344 current_version); |
| 343 } | 345 } |
| 344 } | 346 } |
| 345 | 347 |
| 346 } // namespace chrome | 348 } // namespace chrome |
| OLD | NEW |