diff options
| author | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 19:49:25 +0000 |
|---|---|---|
| committer | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 19:49:25 +0000 |
| commit | cbff87d99f8ab2aad96b055cdd6af40cef48f452 (patch) | |
| tree | fae57f2f77a94c125f720c87680d4f81f44dd033 /chrome/app | |
| parent | 722e0dff34891a578169a98b0d985432b66b3fbf (diff) | |
| download | chromium_src-cbff87d99f8ab2aad96b055cdd6af40cef48f452.zip chromium_src-cbff87d99f8ab2aad96b055cdd6af40cef48f452.tar.gz chromium_src-cbff87d99f8ab2aad96b055cdd6af40cef48f452.tar.bz2 | |
This CL reverts:
140439 - Make OTP sign in on by default. It can be turned off in about:flags
BUG=81265
TEST=Signing in should ask for OTP instead of ASP.
for the M21 branch. This is being committed to trunk first so we can test it in canary for a little while before merging to M21. Once merged, this will be reverted so that OTP sign in becomes the default again in M22.
This CL includes some string changes in the about:flags page which normally would not be allowed for merging into M21, but because this reverts back to string used in M20 this should be fine.
Drover did not work for reverting because there have been other changes since 140439 causing build breaks, so doing the revert manually.
OTP sign is still available in the binary, but needs to be manually enabled in about:flags.
BUG=81265
TEST=Signing in should ask for ASP instead of OTP.
Review URL: https://chromiumcodereview.appspot.com/10800010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 4fe465e..f3ac0d8 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -16703,12 +16703,12 @@ Battery full Dark Theme </message> - <message name="IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_NAME" desc="Name of about:flag option to turn off ClientOAuth sign in"> - Use ClientLogin signin + <message name="IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_NAME" desc="Name of about:flag option to turn on ClientOAuth sign in"> + Enable ClientOAuth signin </message> - <message name="IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION" desc="Description of about:flag option to turn off ClientOAuth sign in"> - Enable this option to use ClientLogin to connect a profile to a Google account instead of ClientOAuth. - ClientLogin uses ASPs during authentication. ClientOAuth uses verification codes (i.e. OTPs) during authentication. + <message name="IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION" desc="Description of about:flag option to turn on ClientOAuth sign in"> + When enabled, will use ClientOAuth to connect a profile to a Google account. Otherwise ClientLogin is used. + ClientOAuth permits using verification codes instead of ASPs during authentication. </message> <!-- Windows 8 Metro mode. --> |