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

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

Issue 539273002: Added UI to enable debugging features on CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 #include "chrome/browser/chromeos/preferences.h" 180 #include "chrome/browser/chromeos/preferences.h"
181 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 181 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
182 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 182 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
183 #include "chrome/browser/chromeos/status/data_promo_notification.h" 183 #include "chrome/browser/chromeos/status/data_promo_notification.h"
184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
187 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 187 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
188 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" 188 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
190 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
190 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 191 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
191 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 192 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
192 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 193 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
193 #include "components/invalidation/invalidator_storage.h" 194 #include "components/invalidation/invalidator_storage.h"
194 #else 195 #else
195 #include "chrome/browser/extensions/default_apps.h" 196 #include "chrome/browser/extensions/default_apps.h"
196 #endif 197 #endif
197 198
198 #if defined(OS_MACOSX) 199 #if defined(OS_MACOSX)
199 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 200 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 324
324 #if defined(OS_CHROMEOS) 325 #if defined(OS_CHROMEOS)
325 ChromeOSMetricsProvider::RegisterPrefs(registry); 326 ChromeOSMetricsProvider::RegisterPrefs(registry);
326 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 327 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
327 chromeos::ChargerReplacementHandler::RegisterPrefs(registry); 328 chromeos::ChargerReplacementHandler::RegisterPrefs(registry);
328 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); 329 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry);
329 chromeos::DataPromoNotification::RegisterPrefs(registry); 330 chromeos::DataPromoNotification::RegisterPrefs(registry);
330 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 331 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
331 chromeos::device_settings_cache::RegisterPrefs(registry); 332 chromeos::device_settings_cache::RegisterPrefs(registry);
332 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 333 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
334 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry);
333 chromeos::language_prefs::RegisterPrefs(registry); 335 chromeos::language_prefs::RegisterPrefs(registry);
334 chromeos::KioskAppManager::RegisterPrefs(registry); 336 chromeos::KioskAppManager::RegisterPrefs(registry);
335 chromeos::MultiProfileUserController::RegisterPrefs(registry); 337 chromeos::MultiProfileUserController::RegisterPrefs(registry);
336 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry); 338 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);
337 chromeos::DemoModeDetector::RegisterPrefs(registry); 339 chromeos::DemoModeDetector::RegisterPrefs(registry);
338 chromeos::Preferences::RegisterPrefs(registry); 340 chromeos::Preferences::RegisterPrefs(registry);
339 chromeos::proxy_config::RegisterPrefs(registry); 341 chromeos::proxy_config::RegisterPrefs(registry);
340 chromeos::RegisterDisplayLocalStatePrefs(registry); 342 chromeos::RegisterDisplayLocalStatePrefs(registry);
341 chromeos::ResetScreenHandler::RegisterPrefs(registry); 343 chromeos::ResetScreenHandler::RegisterPrefs(registry);
342 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 344 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); 705 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);
704 706
705 // We're done migrating the profile per-host zoom level values, so we clear 707 // We're done migrating the profile per-host zoom level values, so we clear
706 // them all. 708 // them all.
707 DictionaryPrefUpdate host_zoom_dictionary_update( 709 DictionaryPrefUpdate host_zoom_dictionary_update(
708 prefs, prefs::kPerHostZoomLevelsDeprecated); 710 prefs, prefs::kPerHostZoomLevelsDeprecated);
709 host_zoom_dictionary_update->Clear(); 711 host_zoom_dictionary_update->Clear();
710 } 712 }
711 713
712 } // namespace chrome 714 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698