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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "chrome/browser/profiles/profile.h" | 55 #include "chrome/browser/profiles/profile.h" |
56 #include "chrome/browser/profiles/profile_impl.h" | 56 #include "chrome/browser/profiles/profile_impl.h" |
57 #include "chrome/browser/profiles/profile_info_cache.h" | 57 #include "chrome/browser/profiles/profile_info_cache.h" |
58 #include "chrome/browser/profiles/profiles_state.h" | 58 #include "chrome/browser/profiles/profiles_state.h" |
59 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 59 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
60 #include "chrome/browser/search/search.h" | 60 #include "chrome/browser/search/search.h" |
61 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 61 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
62 #include "chrome/browser/signin/signin_manager_factory.h" | 62 #include "chrome/browser/signin/signin_manager_factory.h" |
63 #include "chrome/browser/signin/signin_promo.h" | 63 #include "chrome/browser/signin/signin_promo.h" |
64 #include "chrome/browser/task_manager/task_manager.h" | 64 #include "chrome/browser/task_manager/task_manager.h" |
| 65 #include "chrome/browser/ui/app_list/app_list_prefs.h" |
65 #include "chrome/browser/ui/app_list/app_list_service.h" | 66 #include "chrome/browser/ui/app_list/app_list_service.h" |
66 #include "chrome/browser/ui/browser_ui_prefs.h" | 67 #include "chrome/browser/ui/browser_ui_prefs.h" |
67 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 68 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
68 #include "chrome/browser/ui/network_profile_bubble.h" | 69 #include "chrome/browser/ui/network_profile_bubble.h" |
69 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 70 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
70 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 71 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
71 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 72 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
72 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 73 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
73 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 74 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
74 #include "chrome/browser/ui/webui/flags_ui.h" | 75 #include "chrome/browser/ui/webui/flags_ui.h" |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 #endif | 407 #endif |
407 | 408 |
408 #if defined(ENABLE_EXTENSIONS) | 409 #if defined(ENABLE_EXTENSIONS) |
409 EasyUnlockService::RegisterProfilePrefs(registry); | 410 EasyUnlockService::RegisterProfilePrefs(registry); |
410 extensions::ActivityLog::RegisterProfilePrefs(registry); | 411 extensions::ActivityLog::RegisterProfilePrefs(registry); |
411 extensions::launch_util::RegisterProfilePrefs(registry); | 412 extensions::launch_util::RegisterProfilePrefs(registry); |
412 ExtensionWebUI::RegisterProfilePrefs(registry); | 413 ExtensionWebUI::RegisterProfilePrefs(registry); |
413 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 414 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
414 #endif | 415 #endif |
415 | 416 |
| 417 #if defined(ENABLE_APP_LIST) |
| 418 app_list::AppListPrefs::RegisterProfilePrefs(registry); |
| 419 #endif |
| 420 |
416 #if defined(ENABLE_FULL_PRINTING) | 421 #if defined(ENABLE_FULL_PRINTING) |
417 print_dialog_cloud::RegisterProfilePrefs(registry); | 422 print_dialog_cloud::RegisterProfilePrefs(registry); |
418 printing::StickySettings::RegisterProfilePrefs(registry); | 423 printing::StickySettings::RegisterProfilePrefs(registry); |
419 #endif | 424 #endif |
420 | 425 |
421 #if defined(ENABLE_MANAGED_USERS) | 426 #if defined(ENABLE_MANAGED_USERS) |
422 SupervisedUserService::RegisterProfilePrefs(registry); | 427 SupervisedUserService::RegisterProfilePrefs(registry); |
423 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); | 428 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); |
424 SupervisedUserSyncService::RegisterProfilePrefs(registry); | 429 SupervisedUserSyncService::RegisterProfilePrefs(registry); |
425 #endif | 430 #endif |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 #if defined(OS_CHROMEOS) | 619 #if defined(OS_CHROMEOS) |
615 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 620 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
616 #endif | 621 #endif |
617 | 622 |
618 #if defined(TOOLKIT_VIEWS) | 623 #if defined(TOOLKIT_VIEWS) |
619 MigrateBrowserTabStripPrefs(local_state); | 624 MigrateBrowserTabStripPrefs(local_state); |
620 #endif | 625 #endif |
621 } | 626 } |
622 | 627 |
623 } // namespace chrome | 628 } // namespace chrome |
OLD | NEW |