From 21d5a6b64618bb1c82cfef3aaccb646f1a4fad3b Mon Sep 17 00:00:00 2001 From: "bartfab@chromium.org" Date: Fri, 24 Jan 2014 22:47:14 +0000 Subject: Enable SAML support on Chrome OS by default This CL enables SAML support for login and enrollment on Chrome OS by default. The domains for which SAML can be used are still gated by a server-side whitelist. BUG=336842 TEST=Updated browser test TBR=asargent@chromium.org for gaia_auth_extension_loader.cc Review URL: https://codereview.chromium.org/138663005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246989 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/generated_resources.grd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/app') diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 4867798..225f0d2 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6414,11 +6414,11 @@ Keep your key file in a safe place. You will need it to create new versions of y StickyKeys allows the user to press and release a modifier key, such as Shift, Ctrl, or Alt, and have it remain active until any other key is pressed. - - Enable SAML signin. + + Disable SAML signin. - - Enables SAML signin support for ChromeOS login. + + Disables SAML signin support for ChromeOS login. Enable multiprofiles mode. -- cgit v1.1