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

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

Issue 2207053002: Revert of Define printer configuration objects for Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 175 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
176 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" 176 #include "chrome/browser/chromeos/platform_keys/key_permissions.h"
177 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 177 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
178 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 178 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
179 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 179 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
180 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 180 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
181 #include "chrome/browser/chromeos/policy/device_status_collector.h" 181 #include "chrome/browser/chromeos/policy/device_status_collector.h"
182 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 182 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
183 #include "chrome/browser/chromeos/power/power_prefs.h" 183 #include "chrome/browser/chromeos/power/power_prefs.h"
184 #include "chrome/browser/chromeos/preferences.h" 184 #include "chrome/browser/chromeos/preferences.h"
185 #include "chrome/browser/chromeos/printing/printer_pref_manager.h"
186 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 185 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
187 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 186 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
188 #include "chrome/browser/chromeos/status/data_promo_notification.h" 187 #include "chrome/browser/chromeos/status/data_promo_notification.h"
189 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 188 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
190 #include "chrome/browser/chromeos/system/input_device_settings.h" 189 #include "chrome/browser/chromeos/system/input_device_settings.h"
191 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 190 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
192 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 191 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
193 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 192 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
194 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 193 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
195 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 194 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 #endif 564 #endif
566 565
567 #if defined(OS_CHROMEOS) 566 #if defined(OS_CHROMEOS)
568 arc::ArcAuthService::RegisterProfilePrefs(registry); 567 arc::ArcAuthService::RegisterProfilePrefs(registry);
569 chromeos::first_run::RegisterProfilePrefs(registry); 568 chromeos::first_run::RegisterProfilePrefs(registry);
570 chromeos::file_system_provider::RegisterProfilePrefs(registry); 569 chromeos::file_system_provider::RegisterProfilePrefs(registry);
571 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 570 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
572 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 571 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
573 chromeos::PinStorage::RegisterProfilePrefs(registry); 572 chromeos::PinStorage::RegisterProfilePrefs(registry);
574 chromeos::Preferences::RegisterProfilePrefs(registry); 573 chromeos::Preferences::RegisterProfilePrefs(registry);
575 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry);
576 chromeos::proxy_config::RegisterProfilePrefs(registry); 574 chromeos::proxy_config::RegisterProfilePrefs(registry);
577 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 575 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
578 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 576 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
579 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 577 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
580 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); 578 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);
581 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); 579 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
582 #endif 580 #endif
583 581
584 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 582 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
585 ArcAppListPrefs::RegisterProfilePrefs(registry); 583 ArcAppListPrefs::RegisterProfilePrefs(registry);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 // Added 5/2016. 735 // Added 5/2016.
738 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); 736 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
739 737
740 // Added 7/2016. 738 // Added 7/2016.
741 DeleteWebRTCIdentityStoreDB(profile); 739 DeleteWebRTCIdentityStoreDB(profile);
742 profile_prefs->ClearPref(kNetworkPredictionEnabled); 740 profile_prefs->ClearPref(kNetworkPredictionEnabled);
743 profile_prefs->ClearPref(kDisableSpdy); 741 profile_prefs->ClearPref(kDisableSpdy);
744 } 742 }
745 743
746 } // namespace chrome 744 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/printing/printer_pref_manager.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698