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

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

Issue 2442313003: Move some proxy config code out of src/chrome (Closed)
Patch Set: Rebase Created 4 years, 1 month 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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 #include "chrome/browser/chromeos/first_run/first_run.h" 177 #include "chrome/browser/chromeos/first_run/first_run.h"
178 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" 178 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h"
179 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" 179 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
180 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 180 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
181 #include "chrome/browser/chromeos/login/startup_utils.h" 181 #include "chrome/browser/chromeos/login/startup_utils.h"
182 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 182 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
183 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" 183 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
184 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" 184 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
185 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 185 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
186 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 186 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
187 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
188 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" 187 #include "chrome/browser/chromeos/platform_keys/key_permissions.h"
189 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 188 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
190 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 189 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
191 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 190 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
192 #include "chrome/browser/chromeos/policy/device_status_collector.h" 191 #include "chrome/browser/chromeos/policy/device_status_collector.h"
193 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 192 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
194 #include "chrome/browser/chromeos/power/power_prefs.h" 193 #include "chrome/browser/chromeos/power/power_prefs.h"
195 #include "chrome/browser/chromeos/preferences.h" 194 #include "chrome/browser/chromeos/preferences.h"
196 #include "chrome/browser/chromeos/printing/printer_pref_manager.h" 195 #include "chrome/browser/chromeos/printing/printer_pref_manager.h"
197 #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h" 196 #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h"
198 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 197 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
199 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 198 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
200 #include "chrome/browser/chromeos/status/data_promo_notification.h" 199 #include "chrome/browser/chromeos/status/data_promo_notification.h"
201 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 200 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
202 #include "chrome/browser/chromeos/system/input_device_settings.h" 201 #include "chrome/browser/chromeos/system/input_device_settings.h"
203 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 202 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
204 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 203 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
205 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 204 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
206 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 205 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
207 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 206 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
208 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" 207 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
209 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 208 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
210 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 209 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
211 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 210 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
212 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 211 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
212 #include "chromeos/network/proxy/proxy_config_handler.h"
213 #include "chromeos/timezone/timezone_resolver.h" 213 #include "chromeos/timezone/timezone_resolver.h"
214 #include "components/invalidation/impl/invalidator_storage.h" 214 #include "components/invalidation/impl/invalidator_storage.h"
215 #include "components/onc/onc_pref_names.h" 215 #include "components/onc/onc_pref_names.h"
216 #include "components/quirks/quirks_manager.h" 216 #include "components/quirks/quirks_manager.h"
217 #else 217 #else
218 #include "chrome/browser/extensions/default_apps.h" 218 #include "chrome/browser/extensions/default_apps.h"
219 #endif 219 #endif
220 220
221 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) 221 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
222 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 222 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 // Added 8/2016. 775 // Added 8/2016.
776 profile_prefs->ClearPref(kStaticEncodings); 776 profile_prefs->ClearPref(kStaticEncodings);
777 profile_prefs->ClearPref(kRecentlySelectedEncoding); 777 profile_prefs->ClearPref(kRecentlySelectedEncoding);
778 778
779 // Added 9/2016. 779 // Added 9/2016.
780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
782 } 782 }
783 783
784 } // namespace chrome 784 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698