| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/webui/sync_setup_handler.h" | 5 #include "chrome/browser/ui/webui/sync_setup_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 DictionaryValue* localized_strings) { | 197 DictionaryValue* localized_strings) { |
| 198 DCHECK(localized_strings); | 198 DCHECK(localized_strings); |
| 199 | 199 |
| 200 localized_strings->SetString( | 200 localized_strings->SetString( |
| 201 "invalidPasswordHelpURL", | 201 "invalidPasswordHelpURL", |
| 202 google_util::StringAppendGoogleLocaleParam(kInvalidPasswordHelpUrl)); | 202 google_util::StringAppendGoogleLocaleParam(kInvalidPasswordHelpUrl)); |
| 203 localized_strings->SetString( | 203 localized_strings->SetString( |
| 204 "cannotAccessAccountURL", | 204 "cannotAccessAccountURL", |
| 205 google_util::StringAppendGoogleLocaleParam(kCanNotAccessAccountUrl)); | 205 google_util::StringAppendGoogleLocaleParam(kCanNotAccessAccountUrl)); |
| 206 localized_strings->SetString( | 206 localized_strings->SetString( |
| 207 "createNewAccountURL", | |
| 208 google_util::StringAppendGoogleLocaleParam(kCreateNewAccountUrl)); | |
| 209 localized_strings->SetString( | |
| 210 "introduction", | 207 "introduction", |
| 211 GetStringFUTF16(IDS_SYNC_LOGIN_INTRODUCTION, | 208 GetStringFUTF16(IDS_SYNC_LOGIN_INTRODUCTION, |
| 212 GetStringUTF16(IDS_PRODUCT_NAME))); | 209 GetStringUTF16(IDS_PRODUCT_NAME))); |
| 213 localized_strings->SetString( | 210 localized_strings->SetString( |
| 214 "chooseDataTypesInstructions", | 211 "chooseDataTypesInstructions", |
| 215 GetStringFUTF16(IDS_SYNC_CHOOSE_DATATYPES_INSTRUCTIONS, | 212 GetStringFUTF16(IDS_SYNC_CHOOSE_DATATYPES_INSTRUCTIONS, |
| 216 GetStringUTF16(IDS_PRODUCT_NAME))); | 213 GetStringUTF16(IDS_PRODUCT_NAME))); |
| 217 localized_strings->SetString( | 214 localized_strings->SetString( |
| 218 "encryptionInstructions", | 215 "encryptionInstructions", |
| 219 GetStringFUTF16(IDS_SYNC_ENCRYPTION_INSTRUCTIONS, | 216 GetStringFUTF16(IDS_SYNC_ENCRYPTION_INSTRUCTIONS, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 232 chrome::kSyncGoogleDashboardURL)))); | 229 chrome::kSyncGoogleDashboardURL)))); |
| 233 localized_strings->SetString( | 230 localized_strings->SetString( |
| 234 "promoTitle", | 231 "promoTitle", |
| 235 GetStringFUTF16(IDS_SYNC_PROMO_TITLE, | 232 GetStringFUTF16(IDS_SYNC_PROMO_TITLE, |
| 236 GetStringUTF16(IDS_PRODUCT_NAME))); | 233 GetStringUTF16(IDS_PRODUCT_NAME))); |
| 237 localized_strings->SetString( | 234 localized_strings->SetString( |
| 238 "promoMessageTitle", | 235 "promoMessageTitle", |
| 239 GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE, | 236 GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE, |
| 240 GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); | 237 GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); |
| 241 | 238 |
| 239 std::string create_account_url = |
| 240 google_util::StringAppendGoogleLocaleParam(kCreateNewAccountUrl); |
| 241 string16 create_account = GetStringUTF16(IDS_SYNC_CREATE_ACCOUNT); |
| 242 create_account= UTF8ToUTF16("<a id='create-account-link' target='_blank' " |
| 243 "class='account-link' href='" + create_account_url + "'>") + |
| 244 create_account + UTF8ToUTF16("</a>"); |
| 245 localized_strings->SetString("createAccountLinkHTML", |
| 246 GetStringFUTF16(IDS_SYNC_CREATE_ACCOUNT_PREFIX, create_account)); |
| 247 |
| 242 static OptionsStringResource resources[] = { | 248 static OptionsStringResource resources[] = { |
| 243 { "syncSetupOverlayTitle", IDS_SYNC_SETUP_TITLE }, | 249 { "syncSetupOverlayTitle", IDS_SYNC_SETUP_TITLE }, |
| 244 { "syncSetupConfigureTitle", IDS_SYNC_SETUP_CONFIGURE_TITLE }, | 250 { "syncSetupConfigureTitle", IDS_SYNC_SETUP_CONFIGURE_TITLE }, |
| 245 { "signinPrefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX }, | |
| 246 { "signinSuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX }, | |
| 247 { "cannotBeBlank", IDS_SYNC_CANNOT_BE_BLANK }, | 251 { "cannotBeBlank", IDS_SYNC_CANNOT_BE_BLANK }, |
| 248 { "emailLabel", IDS_SYNC_LOGIN_EMAIL }, | 252 { "emailLabel", IDS_SYNC_LOGIN_EMAIL_NEW_LINE }, |
| 249 { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD }, | 253 { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD_NEW_LINE }, |
| 250 { "invalidCredentials", IDS_SYNC_INVALID_USER_CREDENTIALS }, | 254 { "invalidCredentials", IDS_SYNC_INVALID_USER_CREDENTIALS }, |
| 251 { "signin", IDS_SYNC_SIGNIN }, | 255 { "signin", IDS_SYNC_SIGNIN }, |
| 252 { "couldNotConnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT }, | 256 { "couldNotConnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT }, |
| 253 { "unrecoverableError", IDS_SYNC_UNRECOVERABLE_ERROR }, | 257 { "unrecoverableError", IDS_SYNC_UNRECOVERABLE_ERROR }, |
| 254 { "errorLearnMore", IDS_LEARN_MORE }, | 258 { "errorLearnMore", IDS_LEARN_MORE }, |
| 255 { "unrecoverableErrorHelpURL", IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL }, | 259 { "unrecoverableErrorHelpURL", IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL }, |
| 256 { "cannotAccessAccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT }, | 260 { "cannotAccessAccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT }, |
| 257 { "createAccount", IDS_SYNC_CREATE_ACCOUNT }, | |
| 258 { "cancel", IDS_CANCEL }, | 261 { "cancel", IDS_CANCEL }, |
| 259 { "settingUp", IDS_SYNC_LOGIN_SETTING_UP }, | 262 { "settingUp", IDS_SYNC_LOGIN_SETTING_UP }, |
| 260 { "errorSigningIn", IDS_SYNC_ERROR_SIGNING_IN }, | 263 { "errorSigningIn", IDS_SYNC_ERROR_SIGNING_IN }, |
| 264 { "signinHeader", IDS_SYNC_PROMO_SIGNIN_HEADER}, |
| 261 { "captchaInstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS }, | 265 { "captchaInstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS }, |
| 262 { "invalidAccessCode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL }, | 266 { "invalidAccessCode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL }, |
| 263 { "enterAccessCode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL }, | 267 { "enterAccessCode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL }, |
| 264 { "getAccessCodeHelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL }, | 268 { "getAccessCodeHelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL }, |
| 265 { "getAccessCodeURL", IDS_SYNC_GET_ACCESS_CODE_URL }, | 269 { "getAccessCodeURL", IDS_SYNC_GET_ACCESS_CODE_URL }, |
| 266 { "syncAllDataTypes", IDS_SYNC_EVERYTHING }, | 270 { "syncAllDataTypes", IDS_SYNC_EVERYTHING }, |
| 267 { "chooseDataTypes", IDS_SYNC_CHOOSE_DATATYPES }, | 271 { "chooseDataTypes", IDS_SYNC_CHOOSE_DATATYPES }, |
| 268 { "bookmarks", IDS_SYNC_DATATYPE_BOOKMARKS }, | 272 { "bookmarks", IDS_SYNC_DATATYPE_BOOKMARKS }, |
| 269 { "preferences", IDS_SYNC_DATATYPE_PREFERENCES }, | 273 { "preferences", IDS_SYNC_DATATYPE_PREFERENCES }, |
| 270 { "autofill", IDS_SYNC_DATATYPE_AUTOFILL }, | 274 { "autofill", IDS_SYNC_DATATYPE_AUTOFILL }, |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 600 } | 604 } |
| 601 | 605 |
| 602 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) { | 606 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) { |
| 603 DictionaryValue args; | 607 DictionaryValue args; |
| 604 Profile* profile = Profile::FromWebUI(web_ui_); | 608 Profile* profile = Profile::FromWebUI(web_ui_); |
| 605 ProfileSyncService* service = profile->GetProfileSyncService(); | 609 ProfileSyncService* service = profile->GetProfileSyncService(); |
| 606 SyncSetupFlow::GetArgsForGaiaLogin(service, &args); | 610 SyncSetupFlow::GetArgsForGaiaLogin(service, &args); |
| 607 args.SetString("error_message", error_message); | 611 args.SetString("error_message", error_message); |
| 608 ShowGaiaLogin(args); | 612 ShowGaiaLogin(args); |
| 609 } | 613 } |
| OLD | NEW |