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/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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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" | 49 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 51 #include "chrome/browser/tabs/pinned_tab_codec.h" | 51 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 52 #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/gesture_prefs.h" | 56 #include "chrome/browser/ui/gesture_prefs.h" |
| 58 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 57 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 59 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 58 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 60 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 59 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 61 #include "chrome/browser/ui/webui/flags_ui.h" | 60 #include "chrome/browser/ui/webui/flags_ui.h" |
| 62 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | 61 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 #include "chrome/browser/policy/auto_enrollment_client.h" | 95 #include "chrome/browser/policy/auto_enrollment_client.h" |
| 97 #include "chrome/browser/policy/device_status_collector.h" | 96 #include "chrome/browser/policy/device_status_collector.h" |
| 98 #else | 97 #else |
| 99 #include "chrome/browser/extensions/default_apps.h" | 98 #include "chrome/browser/extensions/default_apps.h" |
| 100 #endif | 99 #endif |
| 101 | 100 |
| 102 #if defined(USE_ASH) | 101 #if defined(USE_ASH) |
| 103 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" | 102 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" |
| 104 #endif | 103 #endif |
| 105 | 104 |
| 105 #if defined(ENABLE_TASK_MANAGER) | |
|
jam
2012/04/02 15:49:28
nit: ditto
| |
| 106 #include "chrome/browser/task_manager/task_manager.h" | |
| 107 #endif // defined(ENABLE_TASK_MANAGER) | |
| 108 | |
| 106 namespace browser { | 109 namespace browser { |
| 107 | 110 |
| 108 void RegisterLocalState(PrefService* local_state) { | 111 void RegisterLocalState(PrefService* local_state) { |
| 109 // Prefs in Local State | 112 // Prefs in Local State |
| 110 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 113 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 111 | 114 |
| 112 AppsPromo::RegisterPrefs(local_state); | 115 AppsPromo::RegisterPrefs(local_state); |
| 113 browser_shutdown::RegisterPrefs(local_state); | 116 browser_shutdown::RegisterPrefs(local_state); |
| 114 ExternalProtocolHandler::RegisterPrefs(local_state); | 117 ExternalProtocolHandler::RegisterPrefs(local_state); |
| 115 geolocation::RegisterPrefs(local_state); | 118 geolocation::RegisterPrefs(local_state); |
| 116 GoogleURLTracker::RegisterPrefs(local_state); | 119 GoogleURLTracker::RegisterPrefs(local_state); |
| 117 IntranetRedirectDetector::RegisterPrefs(local_state); | 120 IntranetRedirectDetector::RegisterPrefs(local_state); |
| 118 KeywordEditorController::RegisterPrefs(local_state); | 121 KeywordEditorController::RegisterPrefs(local_state); |
| 119 ManagedMode::RegisterPrefs(local_state); | 122 ManagedMode::RegisterPrefs(local_state); |
| 120 MetricsLog::RegisterPrefs(local_state); | 123 MetricsLog::RegisterPrefs(local_state); |
| 121 MetricsService::RegisterPrefs(local_state); | 124 MetricsService::RegisterPrefs(local_state); |
| 122 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); | 125 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); |
| 123 ProfileInfoCache::RegisterPrefs(local_state); | 126 ProfileInfoCache::RegisterPrefs(local_state); |
| 124 ProfileManager::RegisterPrefs(local_state); | 127 ProfileManager::RegisterPrefs(local_state); |
| 125 SSLConfigServiceManager::RegisterPrefs(local_state); | 128 SSLConfigServiceManager::RegisterPrefs(local_state); |
| 126 TaskManager::RegisterPrefs(local_state); | |
| 127 WebCacheManager::RegisterPrefs(local_state); | 129 WebCacheManager::RegisterPrefs(local_state); |
| 128 | 130 |
| 129 #if defined(ENABLE_CONFIGURATION_POLICY) | 131 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 130 policy::CloudPolicySubsystem::RegisterPrefs(local_state); | 132 policy::CloudPolicySubsystem::RegisterPrefs(local_state); |
| 131 #endif | 133 #endif |
| 132 | 134 |
| 133 #if defined(ENABLE_NOTIFICATIONS) | 135 #if defined(ENABLE_NOTIFICATIONS) |
| 134 NotificationUIManager::RegisterPrefs(local_state); | 136 NotificationUIManager::RegisterPrefs(local_state); |
| 135 #endif | 137 #endif |
| 136 | 138 |
| 137 #if defined(ENABLE_SAFE_BROWSING) | 139 #if defined(ENABLE_SAFE_BROWSING) |
| 138 SafeBrowsingService::RegisterPrefs(local_state); | 140 SafeBrowsingService::RegisterPrefs(local_state); |
| 139 #endif | 141 #endif |
| 140 | 142 |
| 143 #if defined(ENABLE_TASK_MANAGER) | |
| 144 TaskManager::RegisterPrefs(local_state); | |
| 145 #endif // defined(ENABLE_TASK_MANAGER) | |
| 146 | |
| 141 #if defined(TOOLKIT_VIEWS) | 147 #if defined(TOOLKIT_VIEWS) |
| 142 BrowserView::RegisterBrowserViewPrefs(local_state); | 148 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 143 #endif | 149 #endif |
| 144 | 150 |
| 145 #if !defined(OS_ANDROID) | 151 #if !defined(OS_ANDROID) |
| 146 BackgroundModeManager::RegisterPrefs(local_state); | 152 BackgroundModeManager::RegisterPrefs(local_state); |
| 147 Browser::RegisterPrefs(local_state); | 153 Browser::RegisterPrefs(local_state); |
| 148 FlagsUI::RegisterPrefs(local_state); | 154 FlagsUI::RegisterPrefs(local_state); |
| 149 NewTabPageHandler::RegisterPrefs(local_state); | 155 NewTabPageHandler::RegisterPrefs(local_state); |
| 150 printing::PrintJobManager::RegisterPrefs(local_state); | 156 printing::PrintJobManager::RegisterPrefs(local_state); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 283 } | 289 } |
| 284 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 290 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 285 | 291 |
| 286 current_version |= WINDOWS_PREFS; | 292 current_version |= WINDOWS_PREFS; |
| 287 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 293 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 288 current_version); | 294 current_version); |
| 289 } | 295 } |
| 290 } | 296 } |
| 291 | 297 |
| 292 } // namespace browser | 298 } // namespace browser |
| OLD | NEW |