| 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 67 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
| 68 #include "chrome/browser/renderer_host/web_cache_manager.h" | 68 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 69 #include "chrome/browser/search/search.h" | 69 #include "chrome/browser/search/search.h" |
| 70 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 70 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 71 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 71 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
| 72 #include "chrome/browser/signin/signin_manager_factory.h" | 72 #include "chrome/browser/signin/signin_manager_factory.h" |
| 73 #include "chrome/browser/signin/signin_promo.h" | 73 #include "chrome/browser/signin/signin_promo.h" |
| 74 #include "chrome/browser/sync/sync_prefs.h" | 74 #include "chrome/browser/sync/sync_prefs.h" |
| 75 #include "chrome/browser/task_manager/task_manager.h" | 75 #include "chrome/browser/task_manager/task_manager.h" |
| 76 #include "chrome/browser/translate/translate_prefs.h" | 76 #include "chrome/browser/translate/translate_prefs.h" |
| 77 #include "chrome/browser/ui/alternate_error_tab_observer.h" | |
| 78 #include "chrome/browser/ui/app_list/app_list_service.h" | 77 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 79 #include "chrome/browser/ui/browser_ui_prefs.h" | 78 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 79 #include "chrome/browser/ui/link_doctor_tab_observer.h" |
| 80 #include "chrome/browser/ui/network_profile_bubble.h" | 80 #include "chrome/browser/ui/network_profile_bubble.h" |
| 81 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 81 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 82 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 82 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 83 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 83 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 84 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 84 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 85 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 85 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 86 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 86 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 87 #include "chrome/browser/ui/webui/flags_ui.h" | 87 #include "chrome/browser/ui/webui/flags_ui.h" |
| 88 #include "chrome/browser/ui/webui/instant_ui.h" | 88 #include "chrome/browser/ui/webui/instant_ui.h" |
| 89 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 89 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 #if defined(TOOLKIT_VIEWS) | 324 #if defined(TOOLKIT_VIEWS) |
| 325 RegisterBrowserViewPrefs(registry); | 325 RegisterBrowserViewPrefs(registry); |
| 326 RegisterTabStripLayoutTypePrefs(registry); | 326 RegisterTabStripLayoutTypePrefs(registry); |
| 327 #endif | 327 #endif |
| 328 } | 328 } |
| 329 | 329 |
| 330 // Register prefs applicable to all profiles. | 330 // Register prefs applicable to all profiles. |
| 331 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 331 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 332 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); | 332 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); |
| 333 // User prefs. Please keep this list alphabetized. | 333 // User prefs. Please keep this list alphabetized. |
| 334 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry); | 334 LinkDoctorTabObserver::RegisterProfilePrefs(registry); |
| 335 apps::RegisterProfilePrefs(registry); | 335 apps::RegisterProfilePrefs(registry); |
| 336 autofill::AutofillManager::RegisterProfilePrefs(registry); | 336 autofill::AutofillManager::RegisterProfilePrefs(registry); |
| 337 BookmarkPromptPrefs::RegisterProfilePrefs(registry); | 337 BookmarkPromptPrefs::RegisterProfilePrefs(registry); |
| 338 bookmark_utils::RegisterProfilePrefs(registry); | 338 bookmark_utils::RegisterProfilePrefs(registry); |
| 339 browser_sync::SyncPrefs::RegisterProfilePrefs(registry); | 339 browser_sync::SyncPrefs::RegisterProfilePrefs(registry); |
| 340 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 340 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
| 341 ChromeVersionService::RegisterProfilePrefs(registry); | 341 ChromeVersionService::RegisterProfilePrefs(registry); |
| 342 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( | 342 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( |
| 343 registry); | 343 registry); |
| 344 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 344 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 572 current_version); | 572 current_version); |
| 573 } | 573 } |
| 574 | 574 |
| 575 #if defined(OS_CHROMEOS) | 575 #if defined(OS_CHROMEOS) |
| 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 577 #endif | 577 #endif |
| 578 } | 578 } |
| 579 | 579 |
| 580 } // namespace chrome | 580 } // namespace chrome |
| OLD | NEW |