Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(675)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updating for win p/f Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/io_thread.h" 30 #include "chrome/browser/io_thread.h"
31 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 31 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
32 #include "chrome/browser/media/media_device_id_salt.h" 32 #include "chrome/browser/media/media_device_id_salt.h"
33 #include "chrome/browser/media/media_stream_devices_controller.h" 33 #include "chrome/browser/media/media_stream_devices_controller.h"
34 #include "chrome/browser/metrics/chrome_metrics_service_client.h" 34 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
35 #include "chrome/browser/metrics/variations/variations_service.h" 35 #include "chrome/browser/metrics/variations/variations_service.h"
36 #include "chrome/browser/net/http_server_properties_manager_factory.h" 36 #include "chrome/browser/net/http_server_properties_manager_factory.h"
37 #include "chrome/browser/net/net_pref_observer.h" 37 #include "chrome/browser/net/net_pref_observer.h"
38 #include "chrome/browser/net/prediction_options.h" 38 #include "chrome/browser/net/prediction_options.h"
39 #include "chrome/browser/net/predictor.h" 39 #include "chrome/browser/net/predictor.h"
40 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
41 #include "chrome/browser/net/ssl_config_service_manager.h" 40 #include "chrome/browser/net/ssl_config_service_manager.h"
42 #include "chrome/browser/notifications/extension_welcome_notification.h" 41 #include "chrome/browser/notifications/extension_welcome_notification.h"
43 #include "chrome/browser/notifications/message_center_notification_manager.h" 42 #include "chrome/browser/notifications/message_center_notification_manager.h"
44 #include "chrome/browser/notifications/notifier_state_tracker.h" 43 #include "chrome/browser/notifications/notifier_state_tracker.h"
45 #include "chrome/browser/pepper_flash_settings_manager.h" 44 #include "chrome/browser/pepper_flash_settings_manager.h"
46 #include "chrome/browser/plugins/plugin_finder.h" 45 #include "chrome/browser/plugins/plugin_finder.h"
47 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 46 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
48 #include "chrome/browser/prefs/incognito_mode_prefs.h" 47 #include "chrome/browser/prefs/incognito_mode_prefs.h"
49 #include "chrome/browser/prefs/pref_service_syncable.h" 48 #include "chrome/browser/prefs/pref_service_syncable.h"
50 #include "chrome/browser/prefs/session_startup_pref.h" 49 #include "chrome/browser/prefs/session_startup_pref.h"
(...skipping 29 matching lines...) Expand all
80 #include "chrome/common/pref_names.h" 79 #include "chrome/common/pref_names.h"
81 #include "components/autofill/core/browser/autofill_manager.h" 80 #include "components/autofill/core/browser/autofill_manager.h"
82 #include "components/content_settings/core/browser/host_content_settings_map.h" 81 #include "components/content_settings/core/browser/host_content_settings_map.h"
83 #include "components/dom_distiller/core/distilled_page_prefs.h" 82 #include "components/dom_distiller/core/distilled_page_prefs.h"
84 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" 83 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
85 #include "components/gcm_driver/gcm_channel_status_syncer.h" 84 #include "components/gcm_driver/gcm_channel_status_syncer.h"
86 #include "components/network_time/network_time_tracker.h" 85 #include "components/network_time/network_time_tracker.h"
87 #include "components/omnibox/browser/zero_suggest_provider.h" 86 #include "components/omnibox/browser/zero_suggest_provider.h"
88 #include "components/password_manager/core/browser/password_manager.h" 87 #include "components/password_manager/core/browser/password_manager.h"
89 #include "components/pref_registry/pref_registry_syncable.h" 88 #include "components/pref_registry/pref_registry_syncable.h"
89 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
90 #include "components/rappor/rappor_service.h" 90 #include "components/rappor/rappor_service.h"
91 #include "components/search_engines/template_url_prepopulate_data.h" 91 #include "components/search_engines/template_url_prepopulate_data.h"
92 #include "components/sync_driver/sync_prefs.h" 92 #include "components/sync_driver/sync_prefs.h"
93 #include "components/translate/core/browser/translate_prefs.h" 93 #include "components/translate/core/browser/translate_prefs.h"
94 #include "content/public/browser/render_process_host.h" 94 #include "content/public/browser/render_process_host.h"
95 #include "net/http/http_server_properties_manager.h" 95 #include "net/http/http_server_properties_manager.h"
96 96
97 #if defined(ENABLE_AUTOFILL_DIALOG) 97 #if defined(ENABLE_AUTOFILL_DIALOG)
98 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" 98 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
99 #endif 99 #endif
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698