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

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

Issue 1685103003: Copy challenge*Key methods to enterprise.platformKeys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits; now use ArrayBuffer Created 4 years, 10 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/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 arc::ArcAuthService::RegisterProfilePrefs(registry); 526 arc::ArcAuthService::RegisterProfilePrefs(registry);
527 chromeos::first_run::RegisterProfilePrefs(registry); 527 chromeos::first_run::RegisterProfilePrefs(registry);
528 chromeos::file_system_provider::RegisterProfilePrefs(registry); 528 chromeos::file_system_provider::RegisterProfilePrefs(registry);
529 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 529 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
530 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 530 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
531 chromeos::Preferences::RegisterProfilePrefs(registry); 531 chromeos::Preferences::RegisterProfilePrefs(registry);
532 chromeos::proxy_config::RegisterProfilePrefs(registry); 532 chromeos::proxy_config::RegisterProfilePrefs(registry);
533 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 533 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
534 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 534 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
535 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 535 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
536 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: 536 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);
537 RegisterProfilePrefs(registry);
538 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); 537 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
539 #endif 538 #endif
540 539
541 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 540 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
542 ArcAppListPrefs::RegisterProfilePrefs(registry); 541 ArcAppListPrefs::RegisterProfilePrefs(registry);
543 #endif 542 #endif
544 543
545 #if defined(OS_WIN) 544 #if defined(OS_WIN)
546 component_updater::RegisterProfilePrefsForSwReporter(registry); 545 component_updater::RegisterProfilePrefsForSwReporter(registry);
547 NetworkProfileBubble::RegisterProfilePrefs(registry); 546 NetworkProfileBubble::RegisterProfilePrefs(registry);
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete); 643 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete);
645 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart); 644 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart);
646 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad); 645 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad);
647 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart); 646 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart);
648 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold); 647 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold);
649 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); 648 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold);
650 #endif // defined(USE_AURA) 649 #endif // defined(USE_AURA)
651 } 650 }
652 651
653 } // namespace chrome 652 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698