diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 19:41:55 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 19:41:55 +0000 |
| commit | b65e00045338a4d5d1b0042c987ea880ee23525e (patch) | |
| tree | ef381e564cf14bc4c7b309fdf70394f6f36afac7 /chrome/app | |
| parent | b51c79695ebf9b9d37c92263040f883e8b38dc19 (diff) | |
| download | chromium_src-b65e00045338a4d5d1b0042c987ea880ee23525e.zip chromium_src-b65e00045338a4d5d1b0042c987ea880ee23525e.tar.gz chromium_src-b65e00045338a4d5d1b0042c987ea880ee23525e.tar.bz2 | |
Added preference to restrict which domains can log in.
BUG=128831
TEST=Set google.services.username_pattern by hand in Preferences to ".*@domain.com", ensure that you can only log in using emails from that domain.
Review URL: https://chromiumcodereview.appspot.com/10411035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index c8740d5..97532b7 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -10064,6 +10064,9 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" Sign in to <ph name="SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph>... </message> </if> + <message name="IDS_SYNC_LOGIN_NAME_PROHIBITED" desc="The error message shown when the user tries to sign in to sync using a name that is not allowed by the admin policy"> + Signing in with this username has been disabled by your administrator. + </message> <if expr="pp_ifdef('android')"> <message name="IDS_SYNC_USER_NAME_IN_USE_ERROR" desc="Mobile: An error message shown when a user tries to sign in to sync using a user name that's already in use by another profile."> This account is already being used on this mobile device. |