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

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

Issue 2387253002: cros: Added policies for screen unlock. (Closed)
Patch Set: Fixed patch set 15 errors. Created 4 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/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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 #if defined(OS_CHROMEOS) 169 #if defined(OS_CHROMEOS)
170 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 170 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
171 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 171 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
172 #include "chrome/browser/chromeos/customization/customization_document.h" 172 #include "chrome/browser/chromeos/customization/customization_document.h"
173 #include "chrome/browser/chromeos/display/display_preferences.h" 173 #include "chrome/browser/chromeos/display/display_preferences.h"
174 #include "chrome/browser/chromeos/extensions/echo_private_api.h" 174 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
175 #include "chrome/browser/chromeos/file_system_provider/registry.h" 175 #include "chrome/browser/chromeos/file_system_provider/registry.h"
176 #include "chrome/browser/chromeos/first_run/first_run.h" 176 #include "chrome/browser/chromeos/first_run/first_run.h"
177 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" 177 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h"
178 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
178 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" 179 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
179 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 180 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
180 #include "chrome/browser/chromeos/login/startup_utils.h" 181 #include "chrome/browser/chromeos/login/startup_utils.h"
181 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 182 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
182 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" 183 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
183 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" 184 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
184 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 185 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
185 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 186 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
186 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" 187 #include "chrome/browser/chromeos/platform_keys/key_permissions.h"
187 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 188 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 590
590 #if defined(OS_CHROMEOS) 591 #if defined(OS_CHROMEOS)
591 arc::ArcAuthService::RegisterProfilePrefs(registry); 592 arc::ArcAuthService::RegisterProfilePrefs(registry);
592 chromeos::first_run::RegisterProfilePrefs(registry); 593 chromeos::first_run::RegisterProfilePrefs(registry);
593 chromeos::file_system_provider::RegisterProfilePrefs(registry); 594 chromeos::file_system_provider::RegisterProfilePrefs(registry);
594 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 595 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
595 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 596 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
596 chromeos::PinStorage::RegisterProfilePrefs(registry); 597 chromeos::PinStorage::RegisterProfilePrefs(registry);
597 chromeos::Preferences::RegisterProfilePrefs(registry); 598 chromeos::Preferences::RegisterProfilePrefs(registry);
598 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry); 599 chromeos::PrinterPrefManager::RegisterProfilePrefs(registry);
600 chromeos::RegisterQuickUnlockProfilePrefs(registry);
599 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 601 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
600 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 602 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
601 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 603 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
602 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); 604 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);
603 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); 605 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
604 ::onc::RegisterProfilePrefs(registry); 606 ::onc::RegisterProfilePrefs(registry);
605 #endif 607 #endif
606 608
607 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) 609 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
608 ArcAppListPrefs::RegisterProfilePrefs(registry); 610 ArcAppListPrefs::RegisterProfilePrefs(registry);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 // Added 8/2016. 777 // Added 8/2016.
776 profile_prefs->ClearPref(kStaticEncodings); 778 profile_prefs->ClearPref(kStaticEncodings);
777 profile_prefs->ClearPref(kRecentlySelectedEncoding); 779 profile_prefs->ClearPref(kRecentlySelectedEncoding);
778 780
779 // Added 9/2016. 781 // Added 9/2016.
780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 782 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 783 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
782 } 784 }
783 785
784 } // namespace chrome 786 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698