diff options
| author | rickcam@chromium.org <rickcam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 23:04:08 +0000 |
|---|---|---|
| committer | rickcam@chromium.org <rickcam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 23:04:08 +0000 |
| commit | 1ad795b4c02d1fd42743252685bd411619a2d4e2 (patch) | |
| tree | 7fda327c6629cf77745109bf8f89865b7b83d40f /chrome | |
| parent | 325691f63fa0addcc44b63f7e75fb909b379f22f (diff) | |
| download | chromium_src-1ad795b4c02d1fd42743252685bd411619a2d4e2.zip chromium_src-1ad795b4c02d1fd42743252685bd411619a2d4e2.tar.gz chromium_src-1ad795b4c02d1fd42743252685bd411619a2d4e2.tar.bz2 | |
Changed error message when sync is unavailable for domain.
BUG=74914
TEST=manual
Review URL: http://codereview.chromium.org/6612071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 1b5e2e2..ef2d1ca 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8776,6 +8776,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_SYNC_INVALID_ACCESS_CODE_LABEL" desc="A message telling the user the application-specific password (aka access code) they entered is invalid."> Invalid application-specific password. </message> + <message name="IDS_SYNC_SERVICE_UNAVAILABLE" desc="Error message to display when the user domain entered by the user has sync disabled."> + Sync service is not available for your domain. + </message> <!-- Web Store login dialog strings --> <message name="IDS_WEB_STORE_LOGIN_INTRODUCTION_1" desc="The first message to display in the Web Store login dialog."> diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 365d7ee..03aa1cb 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -36,8 +36,7 @@ void GetStatusLabelsForAuthError(const AuthError& auth_error, link_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL)); if (auth_error.state() == AuthError::INVALID_GAIA_CREDENTIALS || auth_error.state() == AuthError::ACCOUNT_DELETED || - auth_error.state() == AuthError::ACCOUNT_DISABLED || - auth_error.state() == AuthError::SERVICE_UNAVAILABLE) { + auth_error.state() == AuthError::ACCOUNT_DISABLED) { // If the user name is empty then the first login failed, otherwise the // credentials are out-of-date. if (service->GetAuthenticatedUsername().empty()) @@ -46,6 +45,10 @@ void GetStatusLabelsForAuthError(const AuthError& auth_error, else status_label->assign( l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE)); + } else if (auth_error.state() == AuthError::SERVICE_UNAVAILABLE) { + DCHECK (service->GetAuthenticatedUsername().empty()); + status_label->assign( + l10n_util::GetStringUTF16(IDS_SYNC_SERVICE_UNAVAILABLE)); } else if (auth_error.state() == AuthError::CONNECTION_FAILED) { // Note that there is little the user can do if the server is not // reachable. Since attempting to re-connect is done automatically by |