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

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

Issue 2363223002: Fix the Chrome OS ResourceReporter (Closed)
Patch Set: Fix 2 browser_tests Created 4 years, 2 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 185 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
186 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" 186 #include "chrome/browser/chromeos/platform_keys/key_permissions.h"
187 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 187 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
188 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 188 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
189 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 189 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
190 #include "chrome/browser/chromeos/policy/device_status_collector.h" 190 #include "chrome/browser/chromeos/policy/device_status_collector.h"
191 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 191 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
192 #include "chrome/browser/chromeos/power/power_prefs.h" 192 #include "chrome/browser/chromeos/power/power_prefs.h"
193 #include "chrome/browser/chromeos/preferences.h" 193 #include "chrome/browser/chromeos/preferences.h"
194 #include "chrome/browser/chromeos/printing/printer_pref_manager.h" 194 #include "chrome/browser/chromeos/printing/printer_pref_manager.h"
195 #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h"
195 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 196 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
196 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 197 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
197 #include "chrome/browser/chromeos/status/data_promo_notification.h" 198 #include "chrome/browser/chromeos/status/data_promo_notification.h"
198 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 199 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
199 #include "chrome/browser/chromeos/system/input_device_settings.h" 200 #include "chrome/browser/chromeos/system/input_device_settings.h"
200 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 201 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
201 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 202 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
202 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 203 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
203 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 204 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
204 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 205 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); 412 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry);
412 chromeos::language_prefs::RegisterPrefs(registry); 413 chromeos::language_prefs::RegisterPrefs(registry);
413 chromeos::KioskAppManager::RegisterPrefs(registry); 414 chromeos::KioskAppManager::RegisterPrefs(registry);
414 chromeos::MultiProfileUserController::RegisterPrefs(registry); 415 chromeos::MultiProfileUserController::RegisterPrefs(registry);
415 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry); 416 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);
416 chromeos::DemoModeDetector::RegisterPrefs(registry); 417 chromeos::DemoModeDetector::RegisterPrefs(registry);
417 chromeos::Preferences::RegisterPrefs(registry); 418 chromeos::Preferences::RegisterPrefs(registry);
418 chromeos::proxy_config::RegisterPrefs(registry); 419 chromeos::proxy_config::RegisterPrefs(registry);
419 chromeos::RegisterDisplayLocalStatePrefs(registry); 420 chromeos::RegisterDisplayLocalStatePrefs(registry);
420 chromeos::ResetScreenHandler::RegisterPrefs(registry); 421 chromeos::ResetScreenHandler::RegisterPrefs(registry);
422 chromeos::ResourceReporter::RegisterPrefs(registry);
421 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 423 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
422 chromeos::SigninScreenHandler::RegisterPrefs(registry); 424 chromeos::SigninScreenHandler::RegisterPrefs(registry);
423 chromeos::StartupUtils::RegisterPrefs(registry); 425 chromeos::StartupUtils::RegisterPrefs(registry);
424 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 426 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
425 chromeos::system::InputDeviceSettings::RegisterPrefs(registry); 427 chromeos::system::InputDeviceSettings::RegisterPrefs(registry);
426 chromeos::TimeZoneResolver::RegisterPrefs(registry); 428 chromeos::TimeZoneResolver::RegisterPrefs(registry);
427 chromeos::UserImageManager::RegisterPrefs(registry); 429 chromeos::UserImageManager::RegisterPrefs(registry);
428 chromeos::UserSessionManager::RegisterPrefs(registry); 430 chromeos::UserSessionManager::RegisterPrefs(registry);
429 chromeos::WallpaperManager::RegisterPrefs(registry); 431 chromeos::WallpaperManager::RegisterPrefs(registry);
430 chromeos::echo_offer::RegisterPrefs(registry); 432 chromeos::echo_offer::RegisterPrefs(registry);
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 // Added 8/2016. 773 // Added 8/2016.
772 profile_prefs->ClearPref(kStaticEncodings); 774 profile_prefs->ClearPref(kStaticEncodings);
773 profile_prefs->ClearPref(kRecentlySelectedEncoding); 775 profile_prefs->ClearPref(kRecentlySelectedEncoding);
774 776
775 // Added 9/2016. 777 // Added 9/2016.
776 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 778 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
777 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 779 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
778 } 780 }
779 781
780 } // namespace chrome 782 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698