| 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/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| 11 #include "base/prefs/pref_registry_simple.h" | 11 #include "base/prefs/pref_registry_simple.h" |
| 12 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
| 13 #include "base/prefs/scoped_user_pref_update.h" | 13 #include "base/prefs/scoped_user_pref_update.h" |
| 14 #include "chrome/browser/about_flags.h" | 14 #include "chrome/browser/about_flags.h" |
| 15 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 15 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 16 #include "chrome/browser/apps/drive/drive_app_mapping.h" | |
| 17 #include "chrome/browser/apps/shortcut_manager.h" | |
| 18 #include "chrome/browser/autocomplete/zero_suggest_provider.h" | 16 #include "chrome/browser/autocomplete/zero_suggest_provider.h" |
| 19 #include "chrome/browser/background/background_mode_manager.h" | |
| 20 #include "chrome/browser/browser_process_impl.h" | 17 #include "chrome/browser/browser_process_impl.h" |
| 21 #include "chrome/browser/browser_shutdown.h" | 18 #include "chrome/browser/browser_shutdown.h" |
| 22 #include "chrome/browser/chrome_content_browser_client.h" | 19 #include "chrome/browser/chrome_content_browser_client.h" |
| 23 #include "chrome/browser/component_updater/recovery_component_installer.h" | 20 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 24 #include "chrome/browser/content_settings/host_content_settings_map.h" | 21 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 25 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 22 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 26 #include "chrome/browser/devtools/devtools_window.h" | 23 #include "chrome/browser/devtools/devtools_window.h" |
| 27 #include "chrome/browser/download/download_prefs.h" | 24 #include "chrome/browser/download/download_prefs.h" |
| 28 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 25 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 29 #include "chrome/browser/first_run/first_run.h" | 26 #include "chrome/browser/first_run/first_run.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 #include "components/search_engines/template_url_prepopulate_data.h" | 95 #include "components/search_engines/template_url_prepopulate_data.h" |
| 99 #include "components/sync_driver/sync_prefs.h" | 96 #include "components/sync_driver/sync_prefs.h" |
| 100 #include "components/translate/core/browser/translate_prefs.h" | 97 #include "components/translate/core/browser/translate_prefs.h" |
| 101 #include "content/public/browser/render_process_host.h" | 98 #include "content/public/browser/render_process_host.h" |
| 102 #include "net/http/http_server_properties_manager.h" | 99 #include "net/http/http_server_properties_manager.h" |
| 103 | 100 |
| 104 #if defined(ENABLE_AUTOFILL_DIALOG) | 101 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 105 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" | 102 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" |
| 106 #endif | 103 #endif |
| 107 | 104 |
| 105 #if defined(ENABLE_BACKGROUND) |
| 106 #include "chrome/browser/background/background_mode_manager.h" |
| 107 #endif |
| 108 |
| 108 #if defined(ENABLE_CONFIGURATION_POLICY) | 109 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 109 #include "components/policy/core/browser/browser_policy_connector.h" | 110 #include "components/policy/core/browser/browser_policy_connector.h" |
| 110 #include "components/policy/core/browser/url_blacklist_manager.h" | 111 #include "components/policy/core/browser/url_blacklist_manager.h" |
| 111 #include "components/policy/core/common/policy_statistics_collector.h" | 112 #include "components/policy/core/common/policy_statistics_collector.h" |
| 112 #endif | 113 #endif |
| 113 | 114 |
| 114 #if defined(ENABLE_EXTENSIONS) | 115 #if defined(ENABLE_EXTENSIONS) |
| 116 #include "chrome/browser/apps/drive/drive_app_mapping.h" |
| 117 #include "chrome/browser/apps/shortcut_manager.h" |
| 115 #include "chrome/browser/extensions/activity_log/activity_log.h" | 118 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| 116 #include "chrome/browser/extensions/api/commands/command_service.h" | 119 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 117 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 120 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 118 #include "chrome/browser/extensions/extension_web_ui.h" | 121 #include "chrome/browser/extensions/extension_web_ui.h" |
| 119 #include "chrome/browser/extensions/launch_util.h" | 122 #include "chrome/browser/extensions/launch_util.h" |
| 120 #include "chrome/browser/signin/easy_unlock_service.h" | 123 #include "chrome/browser/signin/easy_unlock_service.h" |
| 121 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 124 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 122 #include "extensions/browser/extension_prefs.h" | 125 #include "extensions/browser/extension_prefs.h" |
| 123 #endif | 126 #endif |
| 124 | 127 |
| (...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 687 zoom_level_prefs->ExtractPerHostZoomLevels(host_zoom_dictionary); | 690 zoom_level_prefs->ExtractPerHostZoomLevels(host_zoom_dictionary); |
| 688 | 691 |
| 689 // We're done migrating the profile per-host zoom level values, so we clear | 692 // We're done migrating the profile per-host zoom level values, so we clear |
| 690 // them all. | 693 // them all. |
| 691 DictionaryPrefUpdate host_zoom_dictionary_update( | 694 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 692 prefs, prefs::kPerHostZoomLevelsDeprecated); | 695 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 693 host_zoom_dictionary_update->Clear(); | 696 host_zoom_dictionary_update->Clear(); |
| 694 } | 697 } |
| 695 | 698 |
| 696 } // namespace chrome | 699 } // namespace chrome |
| OLD | NEW |