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

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

Issue 378823002: Move http_server_properties_manager from chrome/browser/net to net/http. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix renames in comments. Created 6 years, 5 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/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 19 matching lines...) Expand all
30 #include "chrome/browser/google/google_url_tracker_factory.h" 30 #include "chrome/browser/google/google_url_tracker_factory.h"
31 #include "chrome/browser/gpu/gl_string_manager.h" 31 #include "chrome/browser/gpu/gl_string_manager.h"
32 #include "chrome/browser/gpu/gpu_mode_manager.h" 32 #include "chrome/browser/gpu/gpu_mode_manager.h"
33 #include "chrome/browser/intranet_redirect_detector.h" 33 #include "chrome/browser/intranet_redirect_detector.h"
34 #include "chrome/browser/io_thread.h" 34 #include "chrome/browser/io_thread.h"
35 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 35 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
36 #include "chrome/browser/media/media_device_id_salt.h" 36 #include "chrome/browser/media/media_device_id_salt.h"
37 #include "chrome/browser/media/media_stream_devices_controller.h" 37 #include "chrome/browser/media/media_stream_devices_controller.h"
38 #include "chrome/browser/metrics/chrome_metrics_service_client.h" 38 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
39 #include "chrome/browser/metrics/variations/variations_service.h" 39 #include "chrome/browser/metrics/variations/variations_service.h"
40 #include "chrome/browser/net/http_server_properties_manager.h" 40 #include "chrome/browser/net/http_server_properties_manager_factory.h"
41 #include "chrome/browser/net/net_pref_observer.h" 41 #include "chrome/browser/net/net_pref_observer.h"
42 #include "chrome/browser/net/prediction_options.h" 42 #include "chrome/browser/net/prediction_options.h"
43 #include "chrome/browser/net/predictor.h" 43 #include "chrome/browser/net/predictor.h"
44 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" 44 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
45 #include "chrome/browser/net/ssl_config_service_manager.h" 45 #include "chrome/browser/net/ssl_config_service_manager.h"
46 #include "chrome/browser/notifications/desktop_notification_service.h" 46 #include "chrome/browser/notifications/desktop_notification_service.h"
47 #include "chrome/browser/notifications/message_center_notification_manager.h" 47 #include "chrome/browser/notifications/message_center_notification_manager.h"
48 #include "chrome/browser/pepper_flash_settings_manager.h" 48 #include "chrome/browser/pepper_flash_settings_manager.h"
49 #include "chrome/browser/plugins/plugin_finder.h" 49 #include "chrome/browser/plugins/plugin_finder.h"
50 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 50 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #include "components/google/core/browser/google_url_tracker.h" 89 #include "components/google/core/browser/google_url_tracker.h"
90 #include "components/network_time/network_time_tracker.h" 90 #include "components/network_time/network_time_tracker.h"
91 #include "components/password_manager/core/browser/password_manager.h" 91 #include "components/password_manager/core/browser/password_manager.h"
92 #include "components/pref_registry/pref_registry_syncable.h" 92 #include "components/pref_registry/pref_registry_syncable.h"
93 #include "components/rappor/rappor_service.h" 93 #include "components/rappor/rappor_service.h"
94 #include "components/search_engines/template_url_prepopulate_data.h" 94 #include "components/search_engines/template_url_prepopulate_data.h"
95 #include "components/sync_driver/sync_prefs.h" 95 #include "components/sync_driver/sync_prefs.h"
96 #include "components/translate/core/browser/translate_prefs.h" 96 #include "components/translate/core/browser/translate_prefs.h"
97 #include "content/public/browser/render_process_host.h" 97 #include "content/public/browser/render_process_host.h"
98 #include "extensions/browser/extension_prefs.h" 98 #include "extensions/browser/extension_prefs.h"
99 #include "net/http/http_server_properties_manager.h"
99 100
100 #if defined(ENABLE_AUTOFILL_DIALOG) 101 #if defined(ENABLE_AUTOFILL_DIALOG)
101 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" 102 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
102 #endif 103 #endif
103 104
104 #if defined(ENABLE_CONFIGURATION_POLICY) 105 #if defined(ENABLE_CONFIGURATION_POLICY)
105 #include "components/policy/core/browser/browser_policy_connector.h" 106 #include "components/policy/core/browser/browser_policy_connector.h"
106 #include "components/policy/core/browser/url_blacklist_manager.h" 107 #include "components/policy/core/browser/url_blacklist_manager.h"
107 #include "components/policy/core/common/policy_statistics_collector.h" 108 #include "components/policy/core/common/policy_statistics_collector.h"
108 #endif 109 #endif
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 347
347 // Register prefs applicable to all profiles. 348 // Register prefs applicable to all profiles.
348 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 349 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
349 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); 350 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
350 // User prefs. Please keep this list alphabetized. 351 // User prefs. Please keep this list alphabetized.
351 autofill::AutofillManager::RegisterProfilePrefs(registry); 352 autofill::AutofillManager::RegisterProfilePrefs(registry);
352 bookmark_utils::RegisterProfilePrefs(registry); 353 bookmark_utils::RegisterProfilePrefs(registry);
353 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); 354 sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
354 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 355 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
355 ChromeVersionService::RegisterProfilePrefs(registry); 356 ChromeVersionService::RegisterProfilePrefs(registry);
356 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( 357 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs(
357 registry); 358 registry);
358 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 359 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
359 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); 360 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry);
360 chrome_prefs::RegisterProfilePrefs(registry); 361 chrome_prefs::RegisterProfilePrefs(registry);
361 DownloadPrefs::RegisterProfilePrefs(registry); 362 DownloadPrefs::RegisterProfilePrefs(registry);
362 easy_unlock::RegisterProfilePrefs(registry); 363 easy_unlock::RegisterProfilePrefs(registry);
363 gcm::GCMProfileService::RegisterProfilePrefs(registry); 364 gcm::GCMProfileService::RegisterProfilePrefs(registry);
364 HostContentSettingsMap::RegisterProfilePrefs(registry); 365 HostContentSettingsMap::RegisterProfilePrefs(registry);
365 IncognitoModePrefs::RegisterProfilePrefs(registry); 366 IncognitoModePrefs::RegisterProfilePrefs(registry);
366 InstantUI::RegisterProfilePrefs(registry); 367 InstantUI::RegisterProfilePrefs(registry);
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 #if defined(OS_CHROMEOS) 596 #if defined(OS_CHROMEOS)
596 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 597 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
597 #endif 598 #endif
598 599
599 #if defined(TOOLKIT_VIEWS) 600 #if defined(TOOLKIT_VIEWS)
600 MigrateBrowserTabStripPrefs(local_state); 601 MigrateBrowserTabStripPrefs(local_state);
601 #endif 602 #endif
602 } 603 }
603 604
604 } // namespace chrome 605 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/net/http_server_properties_manager_unittest.cc ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698