| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/signin/signin_global_error.h" | 5 #include "chrome/browser/signin/signin_global_error.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 // In the case of no error, or a simple network error, don't bother | 159 // In the case of no error, or a simple network error, don't bother |
| 160 // displaying a popup bubble. | 160 // displaying a popup bubble. |
| 161 case GoogleServiceAuthError::CONNECTION_FAILED: | 161 case GoogleServiceAuthError::CONNECTION_FAILED: |
| 162 case GoogleServiceAuthError::NONE: | 162 case GoogleServiceAuthError::NONE: |
| 163 return messages; | 163 return messages; |
| 164 | 164 |
| 165 // TODO(rogerta): use account id in error messages. | 165 // TODO(rogerta): use account id in error messages. |
| 166 | 166 |
| 167 // User credentials are invalid (bad acct, etc). | 167 // User credentials are invalid (bad acct, etc). |
| 168 case GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS: | 168 case GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS: |
| 169 case GoogleServiceAuthError::SERVICE_ERROR: |
| 169 case GoogleServiceAuthError::ACCOUNT_DELETED: | 170 case GoogleServiceAuthError::ACCOUNT_DELETED: |
| 170 case GoogleServiceAuthError::ACCOUNT_DISABLED: | 171 case GoogleServiceAuthError::ACCOUNT_DISABLED: |
| 171 messages.push_back(l10n_util::GetStringFUTF16( | 172 messages.push_back(l10n_util::GetStringFUTF16( |
| 172 IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE, | 173 IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE, |
| 173 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 174 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 174 break; | 175 break; |
| 175 | 176 |
| 176 // Sync service is not available for this account's domain. | 177 // Sync service is not available for this account's domain. |
| 177 case GoogleServiceAuthError::SERVICE_UNAVAILABLE: | 178 case GoogleServiceAuthError::SERVICE_UNAVAILABLE: |
| 178 messages.push_back(l10n_util::GetStringFUTF16( | 179 messages.push_back(l10n_util::GetStringFUTF16( |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 | 214 |
| 214 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) { | 215 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) { |
| 215 NOTREACHED(); | 216 NOTREACHED(); |
| 216 } | 217 } |
| 217 | 218 |
| 218 // static | 219 // static |
| 219 SigninGlobalError* SigninGlobalError::GetForProfile(Profile* profile) { | 220 SigninGlobalError* SigninGlobalError::GetForProfile(Profile* profile) { |
| 220 return ProfileOAuth2TokenServiceFactory::GetForProfile(profile)-> | 221 return ProfileOAuth2TokenServiceFactory::GetForProfile(profile)-> |
| 221 signin_global_error(); | 222 signin_global_error(); |
| 222 } | 223 } |
| OLD | NEW |