| 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/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| 11 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
| 12 #include "base/prefs/scoped_user_pref_update.h" | |
| 13 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
| 14 #include "chrome/browser/about_flags.h" | 13 #include "chrome/browser/about_flags.h" |
| 15 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 14 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 16 #include "chrome/browser/browser_process_impl.h" | 15 #include "chrome/browser/browser_process_impl.h" |
| 17 #include "chrome/browser/browser_shutdown.h" | 16 #include "chrome/browser/browser_shutdown.h" |
| 18 #include "chrome/browser/chrome_content_browser_client.h" | 17 #include "chrome/browser/chrome_content_browser_client.h" |
| 19 #include "chrome/browser/component_updater/recovery_component_installer.h" | 18 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 20 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 19 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
| 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 22 #include "chrome/browser/devtools/devtools_window.h" | 21 #include "chrome/browser/devtools/devtools_window.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 66 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 68 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 67 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 69 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 68 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 70 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 69 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 71 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 70 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 72 #include "chrome/browser/ui/webui/flags_ui.h" | 71 #include "chrome/browser/ui/webui/flags_ui.h" |
| 73 #include "chrome/browser/ui/webui/instant_ui.h" | 72 #include "chrome/browser/ui/webui/instant_ui.h" |
| 74 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 73 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 75 #include "chrome/browser/ui/webui/plugins_ui.h" | 74 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 76 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 75 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 77 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" | |
| 78 #include "chrome/browser/upgrade_detector.h" | 76 #include "chrome/browser/upgrade_detector.h" |
| 79 #include "chrome/browser/web_resource/promo_resource_service.h" | 77 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 80 #include "chrome/common/pref_names.h" | 78 #include "chrome/common/pref_names.h" |
| 81 #include "components/autofill/core/browser/autofill_manager.h" | 79 #include "components/autofill/core/browser/autofill_manager.h" |
| 82 #include "components/content_settings/core/browser/host_content_settings_map.h" | 80 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 83 #include "components/dom_distiller/core/distilled_page_prefs.h" | 81 #include "components/dom_distiller/core/distilled_page_prefs.h" |
| 84 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" | 82 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" |
| 85 #include "components/gcm_driver/gcm_channel_status_syncer.h" | 83 #include "components/gcm_driver/gcm_channel_status_syncer.h" |
| 86 #include "components/network_time/network_time_tracker.h" | 84 #include "components/network_time/network_time_tracker.h" |
| 87 #include "components/omnibox/browser/zero_suggest_provider.h" | 85 #include "components/omnibox/browser/zero_suggest_provider.h" |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs); | 575 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs); |
| 578 #endif | 576 #endif |
| 579 | 577 |
| 580 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 578 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| 581 // Added 02/2015. | 579 // Added 02/2015. |
| 582 MigrateGoogleNowPrefs(profile); | 580 MigrateGoogleNowPrefs(profile); |
| 583 #endif | 581 #endif |
| 584 } | 582 } |
| 585 | 583 |
| 586 } // namespace chrome | 584 } // namespace chrome |
| OLD | NEW |