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

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

Issue 1528963002: Quirks Client for downloading and providing display profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove hacks for clean, but non-working, draft Created 4 years, 11 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/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 189 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
190 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 190 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
191 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 191 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
192 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" 192 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
193 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 193 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
194 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 194 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
195 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 195 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
196 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 196 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
197 #include "chromeos/timezone/timezone_resolver.h" 197 #include "chromeos/timezone/timezone_resolver.h"
198 #include "components/invalidation/impl/invalidator_storage.h" 198 #include "components/invalidation/impl/invalidator_storage.h"
199 #include "components/quirks_client/quirks_client.h"
199 #else 200 #else
200 #include "chrome/browser/extensions/default_apps.h" 201 #include "chrome/browser/extensions/default_apps.h"
201 #endif 202 #endif
202 203
203 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 204 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
204 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 205 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
205 #include "chrome/browser/ui/app_list/google_now_extension.h" 206 #include "chrome/browser/ui/app_list/google_now_extension.h"
206 #endif 207 #endif
207 208
208 #if defined(OS_MACOSX) 209 #if defined(OS_MACOSX)
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 chromeos::DemoModeDetector::RegisterPrefs(registry); 336 chromeos::DemoModeDetector::RegisterPrefs(registry);
336 chromeos::Preferences::RegisterPrefs(registry); 337 chromeos::Preferences::RegisterPrefs(registry);
337 chromeos::proxy_config::RegisterPrefs(registry); 338 chromeos::proxy_config::RegisterPrefs(registry);
338 chromeos::RegisterDisplayLocalStatePrefs(registry); 339 chromeos::RegisterDisplayLocalStatePrefs(registry);
339 chromeos::ResetScreenHandler::RegisterPrefs(registry); 340 chromeos::ResetScreenHandler::RegisterPrefs(registry);
340 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 341 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
341 chromeos::SigninScreenHandler::RegisterPrefs(registry); 342 chromeos::SigninScreenHandler::RegisterPrefs(registry);
342 chromeos::StartupUtils::RegisterPrefs(registry); 343 chromeos::StartupUtils::RegisterPrefs(registry);
343 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 344 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
344 chromeos::system::InputDeviceSettings::RegisterPrefs(registry); 345 chromeos::system::InputDeviceSettings::RegisterPrefs(registry);
346 chromeos::TimeZoneResolver::RegisterPrefs(registry);
345 chromeos::UserImageManager::RegisterPrefs(registry); 347 chromeos::UserImageManager::RegisterPrefs(registry);
346 chromeos::UserSessionManager::RegisterPrefs(registry); 348 chromeos::UserSessionManager::RegisterPrefs(registry);
347 chromeos::WallpaperManager::RegisterPrefs(registry); 349 chromeos::WallpaperManager::RegisterPrefs(registry);
348 chromeos::echo_offer::RegisterPrefs(registry); 350 chromeos::echo_offer::RegisterPrefs(registry);
349 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); 351 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
350 invalidation::InvalidatorStorage::RegisterPrefs(registry); 352 invalidation::InvalidatorStorage::RegisterPrefs(registry);
351 policy::AutoEnrollmentClient::RegisterPrefs(registry); 353 policy::AutoEnrollmentClient::RegisterPrefs(registry);
352 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); 354 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
353 policy::ConsumerManagementService::RegisterPrefs(registry); 355 policy::ConsumerManagementService::RegisterPrefs(registry);
354 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 356 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
355 policy::DeviceStatusCollector::RegisterPrefs(registry); 357 policy::DeviceStatusCollector::RegisterPrefs(registry);
356 policy::PolicyCertServiceFactory::RegisterPrefs(registry); 358 policy::PolicyCertServiceFactory::RegisterPrefs(registry);
357 chromeos::TimeZoneResolver::RegisterPrefs(registry); 359 quirks_client::QuirksClientDelegate::RegisterPrefs(registry);
358 #endif 360 #endif
359 361
360 #if defined(OS_MACOSX) 362 #if defined(OS_MACOSX)
361 confirm_quit::RegisterLocalState(registry); 363 confirm_quit::RegisterLocalState(registry);
362 QuitWithAppsController::RegisterPrefs(registry); 364 QuitWithAppsController::RegisterPrefs(registry);
363 #endif 365 #endif
364 366
365 #if defined(OS_WIN) 367 #if defined(OS_WIN)
366 app_metro_launch::RegisterPrefs(registry); 368 app_metro_launch::RegisterPrefs(registry);
367 component_updater::RegisterPrefsForSwReporter(registry); 369 component_updater::RegisterPrefsForSwReporter(registry);
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 594
593 // Added 12/1015. 595 // Added 12/1015.
594 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); 596 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld);
595 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); 597 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime);
596 598
597 // Added 12/2015. 599 // Added 12/2015.
598 profile_prefs->ClearPref(kRestoreOnStartupMigrated); 600 profile_prefs->ClearPref(kRestoreOnStartupMigrated);
599 } 601 }
600 602
601 } // namespace chrome 603 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698