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

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

Issue 143463009: Add policy that forces SAML users to log in online periodically (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Speculative fix for PolicyPrefIndicatorTest.CheckPolicyIndicators/3. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/policy/policy_prefs_browsertest.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" 137 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
138 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" 138 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h"
139 #include "chrome/browser/chromeos/customization_document.h" 139 #include "chrome/browser/chromeos/customization_document.h"
140 #include "chrome/browser/chromeos/display/display_preferences.h" 140 #include "chrome/browser/chromeos/display/display_preferences.h"
141 #include "chrome/browser/chromeos/extensions/echo_private_api.h" 141 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
142 #include "chrome/browser/chromeos/first_run/first_run.h" 142 #include "chrome/browser/chromeos/first_run/first_run.h"
143 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" 143 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h"
144 #include "chrome/browser/chromeos/login/login_utils.h" 144 #include "chrome/browser/chromeos/login/login_utils.h"
145 #include "chrome/browser/chromeos/login/multi_profile_first_run_notification.h" 145 #include "chrome/browser/chromeos/login/multi_profile_first_run_notification.h"
146 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" 146 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h"
147 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
147 #include "chrome/browser/chromeos/login/startup_utils.h" 148 #include "chrome/browser/chromeos/login/startup_utils.h"
148 #include "chrome/browser/chromeos/login/user_image_manager.h" 149 #include "chrome/browser/chromeos/login/user_image_manager.h"
149 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" 150 #include "chrome/browser/chromeos/login/user_image_sync_observer.h"
150 #include "chrome/browser/chromeos/login/user_manager.h" 151 #include "chrome/browser/chromeos/login/user_manager.h"
151 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 152 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
152 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 153 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
153 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 154 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
154 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 155 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
155 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 156 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
156 #include "chrome/browser/chromeos/policy/device_status_collector.h" 157 #include "chrome/browser/chromeos/policy/device_status_collector.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 #endif 426 #endif
426 427
427 #if defined(OS_CHROMEOS) 428 #if defined(OS_CHROMEOS)
428 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( 429 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs(
429 registry); 430 registry);
430 chromeos::first_run::RegisterProfilePrefs(registry); 431 chromeos::first_run::RegisterProfilePrefs(registry);
431 chromeos::MultiProfileFirstRunNotification::RegisterProfilePrefs(registry); 432 chromeos::MultiProfileFirstRunNotification::RegisterProfilePrefs(registry);
432 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 433 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
433 chromeos::Preferences::RegisterProfilePrefs(registry); 434 chromeos::Preferences::RegisterProfilePrefs(registry);
434 chromeos::proxy_config::RegisterProfilePrefs(registry); 435 chromeos::proxy_config::RegisterProfilePrefs(registry);
436 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
435 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 437 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
436 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: 438 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
437 RegisterProfilePrefs(registry); 439 RegisterProfilePrefs(registry);
438 FlagsUI::RegisterProfilePrefs(registry); 440 FlagsUI::RegisterProfilePrefs(registry);
439 #endif 441 #endif
440 442
441 #if defined(OS_MACOSX) 443 #if defined(OS_MACOSX)
442 RegisterBrowserActionsControllerProfilePrefs(registry); 444 RegisterBrowserActionsControllerProfilePrefs(registry);
443 #endif 445 #endif
444 446
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
570 current_version); 572 current_version);
571 } 573 }
572 574
573 #if defined(OS_CHROMEOS) 575 #if defined(OS_CHROMEOS)
574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
575 #endif 577 #endif
576 } 578 }
577 579
578 } // namespace chrome 580 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_prefs_browsertest.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698