diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-24 22:47:14 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-24 22:47:14 +0000 |
| commit | 21d5a6b64618bb1c82cfef3aaccb646f1a4fad3b (patch) | |
| tree | c2f6456c426f0ac56a84cc409e38ab2e72c68073 /chrome/app | |
| parent | a1fff7fde41d69434ee8f76c38700a8cc46865e4 (diff) | |
| download | chromium_src-21d5a6b64618bb1c82cfef3aaccb646f1a4fad3b.zip chromium_src-21d5a6b64618bb1c82cfef3aaccb646f1a4fad3b.tar.gz chromium_src-21d5a6b64618bb1c82cfef3aaccb646f1a4fad3b.tar.bz2 | |
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
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 8 |
1 files changed, 4 insertions, 4 deletions
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 <message name="IDS_FLAGS_ENABLE_STICKY_KEYS_DESCRIPTION" desc="Description for the flag to enable sticky keys."> 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. </message> - <message name="IDS_FLAGS_ENABLE_SAML_SIGNIN_NAME" desc="Name for the flag to enable SAML signin support."> - Enable SAML signin. + <message name="IDS_FLAGS_DISABLE_SAML_SIGNIN_NAME" desc="Name for the flag to disable SAML signin support."> + Disable SAML signin. </message> - <message name="IDS_FLAGS_ENABLE_SAML_SIGNIN_DESCRIPTION" desc="Description for the flag to enable SAML signin support."> - Enables SAML signin support for ChromeOS login. + <message name="IDS_FLAGS_DISABLE_SAML_SIGNIN_DESCRIPTION" desc="Description for the flag to disables SAML signin support."> + Disables SAML signin support for ChromeOS login. </message> <message name="IDS_FLAGS_ENABLE_MULTI_PROFILES_NAME" desc="Name for the flag to enable multi-profile support."> Enable multiprofiles mode. |