OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 #include "chrome/browser/notifications/desktop_notification_service.h" | 41 #include "chrome/browser/notifications/desktop_notification_service.h" |
42 #include "chrome/browser/notifications/notification_prefs_manager.h" | 42 #include "chrome/browser/notifications/notification_prefs_manager.h" |
43 #include "chrome/browser/page_info_model.h" | 43 #include "chrome/browser/page_info_model.h" |
44 #include "chrome/browser/password_manager/password_manager.h" | 44 #include "chrome/browser/password_manager/password_manager.h" |
45 #include "chrome/browser/pepper_flash_settings_manager.h" | 45 #include "chrome/browser/pepper_flash_settings_manager.h" |
46 #include "chrome/browser/plugins/plugin_finder.h" | 46 #include "chrome/browser/plugins/plugin_finder.h" |
47 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 47 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
48 #include "chrome/browser/prefs/pref_service.h" | 48 #include "chrome/browser/prefs/pref_service.h" |
49 #include "chrome/browser/prefs/session_startup_pref.h" | 49 #include "chrome/browser/prefs/session_startup_pref.h" |
50 #include "chrome/browser/profiles/chrome_version_service.h" | 50 #include "chrome/browser/profiles/chrome_version_service.h" |
51 #include "chrome/browser/profiles/gaia_info_update_service.h" | |
52 #include "chrome/browser/profiles/profile_impl.h" | 51 #include "chrome/browser/profiles/profile_impl.h" |
53 #include "chrome/browser/profiles/profile_info_cache.h" | 52 #include "chrome/browser/profiles/profile_info_cache.h" |
54 #include "chrome/browser/profiles/profile_manager.h" | 53 #include "chrome/browser/profiles/profile_manager.h" |
55 #include "chrome/browser/renderer_host/web_cache_manager.h" | 54 #include "chrome/browser/renderer_host/web_cache_manager.h" |
56 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 55 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
57 #include "chrome/browser/signin/signin_manager_factory.h" | 56 #include "chrome/browser/signin/signin_manager_factory.h" |
58 #include "chrome/browser/task_manager/task_manager.h" | 57 #include "chrome/browser/task_manager/task_manager.h" |
59 #include "chrome/browser/translate/translate_prefs.h" | 58 #include "chrome/browser/translate/translate_prefs.h" |
60 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 59 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
61 #include "chrome/browser/ui/browser_instant_controller.h" | 60 #include "chrome/browser/ui/browser_instant_controller.h" |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); | 227 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); |
229 ChromeVersionService::RegisterUserPrefs(user_prefs); | 228 ChromeVersionService::RegisterUserPrefs(user_prefs); |
230 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( | 229 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( |
231 user_prefs); | 230 user_prefs); |
232 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); | 231 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); |
233 DownloadPrefs::RegisterUserPrefs(user_prefs); | 232 DownloadPrefs::RegisterUserPrefs(user_prefs); |
234 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 233 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
235 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); | 234 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); |
236 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 235 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
237 first_run::RegisterUserPrefs(user_prefs); | 236 first_run::RegisterUserPrefs(user_prefs); |
238 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); | |
239 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 237 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
240 IncognitoModePrefs::RegisterUserPrefs(user_prefs); | 238 IncognitoModePrefs::RegisterUserPrefs(user_prefs); |
241 InstantUI::RegisterUserPrefs(user_prefs); | 239 InstantUI::RegisterUserPrefs(user_prefs); |
242 MediaCaptureDevicesDispatcher::RegisterUserPrefs(user_prefs); | 240 MediaCaptureDevicesDispatcher::RegisterUserPrefs(user_prefs); |
243 MediaStreamDevicesController::RegisterUserPrefs(user_prefs); | 241 MediaStreamDevicesController::RegisterUserPrefs(user_prefs); |
244 NetPrefObserver::RegisterUserPrefs(user_prefs); | 242 NetPrefObserver::RegisterUserPrefs(user_prefs); |
245 NewTabUI::RegisterUserPrefs(user_prefs); | 243 NewTabUI::RegisterUserPrefs(user_prefs); |
246 PasswordManager::RegisterUserPrefs(user_prefs); | 244 PasswordManager::RegisterUserPrefs(user_prefs); |
247 PrefProxyConfigTrackerImpl::RegisterUserPrefs(user_prefs); | 245 PrefProxyConfigTrackerImpl::RegisterUserPrefs(user_prefs); |
248 PrefsTabHelper::RegisterUserPrefs(user_prefs); | 246 PrefsTabHelper::RegisterUserPrefs(user_prefs); |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 } | 376 } |
379 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 377 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
380 | 378 |
381 current_version |= GOOGLE_URL_TRACKER_PREFS; | 379 current_version |= GOOGLE_URL_TRACKER_PREFS; |
382 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 380 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
383 current_version); | 381 current_version); |
384 } | 382 } |
385 } | 383 } |
386 | 384 |
387 } // namespace chrome | 385 } // namespace chrome |
OLD | NEW |