| 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" |   12 #include "base/prefs/scoped_user_pref_update.h" | 
|   13 #include "base/trace_event/trace_event.h" |   13 #include "base/trace_event/trace_event.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/autocomplete/zero_suggest_provider.h" |  | 
|   17 #include "chrome/browser/browser_process_impl.h" |   16 #include "chrome/browser/browser_process_impl.h" | 
|   18 #include "chrome/browser/browser_shutdown.h" |   17 #include "chrome/browser/browser_shutdown.h" | 
|   19 #include "chrome/browser/chrome_content_browser_client.h" |   18 #include "chrome/browser/chrome_content_browser_client.h" | 
|   20 #include "chrome/browser/component_updater/recovery_component_installer.h" |   19 #include "chrome/browser/component_updater/recovery_component_installer.h" | 
|   21 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
     " |   20 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
     " | 
|   22 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |   21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 
|   23 #include "chrome/browser/devtools/devtools_window.h" |   22 #include "chrome/browser/devtools/devtools_window.h" | 
|   24 #include "chrome/browser/download/download_prefs.h" |   23 #include "chrome/browser/download/download_prefs.h" | 
|   25 #include "chrome/browser/external_protocol/external_protocol_handler.h" |   24 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 
|   26 #include "chrome/browser/first_run/first_run.h" |   25 #include "chrome/browser/first_run/first_run.h" | 
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   80 #include "chrome/browser/upgrade_detector.h" |   79 #include "chrome/browser/upgrade_detector.h" | 
|   81 #include "chrome/browser/web_resource/promo_resource_service.h" |   80 #include "chrome/browser/web_resource/promo_resource_service.h" | 
|   82 #include "chrome/common/pref_names.h" |   81 #include "chrome/common/pref_names.h" | 
|   83 #include "components/autofill/core/browser/autofill_manager.h" |   82 #include "components/autofill/core/browser/autofill_manager.h" | 
|   84 #include "components/bookmarks/browser/bookmark_utils.h" |   83 #include "components/bookmarks/browser/bookmark_utils.h" | 
|   85 #include "components/content_settings/core/browser/host_content_settings_map.h" |   84 #include "components/content_settings/core/browser/host_content_settings_map.h" | 
|   86 #include "components/dom_distiller/core/distilled_page_prefs.h" |   85 #include "components/dom_distiller/core/distilled_page_prefs.h" | 
|   87 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" |   86 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" | 
|   88 #include "components/gcm_driver/gcm_channel_status_syncer.h" |   87 #include "components/gcm_driver/gcm_channel_status_syncer.h" | 
|   89 #include "components/network_time/network_time_tracker.h" |   88 #include "components/network_time/network_time_tracker.h" | 
 |   89 #include "components/omnibox/zero_suggest_provider.h" | 
|   90 #include "components/password_manager/core/browser/password_manager.h" |   90 #include "components/password_manager/core/browser/password_manager.h" | 
|   91 #include "components/pref_registry/pref_registry_syncable.h" |   91 #include "components/pref_registry/pref_registry_syncable.h" | 
|   92 #include "components/rappor/rappor_service.h" |   92 #include "components/rappor/rappor_service.h" | 
|   93 #include "components/search_engines/template_url_prepopulate_data.h" |   93 #include "components/search_engines/template_url_prepopulate_data.h" | 
|   94 #include "components/sync_driver/sync_prefs.h" |   94 #include "components/sync_driver/sync_prefs.h" | 
|   95 #include "components/translate/core/browser/translate_prefs.h" |   95 #include "components/translate/core/browser/translate_prefs.h" | 
|   96 #include "content/public/browser/render_process_host.h" |   96 #include "content/public/browser/render_process_host.h" | 
|   97 #include "net/http/http_server_properties_manager.h" |   97 #include "net/http/http_server_properties_manager.h" | 
|   98  |   98  | 
|   99 #if defined(ENABLE_AUTOFILL_DIALOG) |   99 #if defined(ENABLE_AUTOFILL_DIALOG) | 
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  630       host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |  630       host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 
|  631  |  631  | 
|  632   // We're done migrating the profile per-host zoom level values, so we clear |  632   // We're done migrating the profile per-host zoom level values, so we clear | 
|  633   // them all. |  633   // them all. | 
|  634   DictionaryPrefUpdate host_zoom_dictionary_update( |  634   DictionaryPrefUpdate host_zoom_dictionary_update( | 
|  635       prefs, prefs::kPerHostZoomLevelsDeprecated); |  635       prefs, prefs::kPerHostZoomLevelsDeprecated); | 
|  636   host_zoom_dictionary_update->Clear(); |  636   host_zoom_dictionary_update->Clear(); | 
|  637 } |  637 } | 
|  638  |  638  | 
|  639 }  // namespace chrome |  639 }  // namespace chrome | 
| OLD | NEW |