Chromium Code Reviews| 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 377 { "sectionExplicitMessagePrefix", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX }, | 377 { "sectionExplicitMessagePrefix", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX }, |
| 378 { "sectionExplicitMessagePostfix", | 378 { "sectionExplicitMessagePostfix", |
| 379 IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX }, | 379 IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX }, |
| 380 { "encryptedDataTypesTitle", IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE }, | 380 { "encryptedDataTypesTitle", IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE }, |
| 381 { "encryptSensitiveOption", IDS_SYNC_ENCRYPT_SENSITIVE_DATA }, | 381 { "encryptSensitiveOption", IDS_SYNC_ENCRYPT_SENSITIVE_DATA }, |
| 382 { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA }, | 382 { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA }, |
| 383 { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA }, | 383 { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA }, |
| 384 { "aspWarningText", IDS_SYNC_ASP_PASSWORD_WARNING_TEXT }, | 384 { "aspWarningText", IDS_SYNC_ASP_PASSWORD_WARNING_TEXT }, |
| 385 { "promoPageTitle", IDS_SYNC_PROMO_TAB_TITLE}, | 385 { "promoPageTitle", IDS_SYNC_PROMO_TAB_TITLE}, |
| 386 { "promoMessageBody", IDS_SYNC_PROMO_MESSAGE_BODY}, | 386 { "promoMessageBody", IDS_SYNC_PROMO_MESSAGE_BODY}, |
| 387 { "promoMessageBodyA", IDS_SYNC_PROMO_MESSAGE_BODY_A}, | |
|
sail
2011/11/28 16:34:25
instead of having multiple strings here and then d
SteveT
2011/11/28 20:07:32
So I addressed this roughly in the way you suggest
| |
| 388 { "promoMessageBodyB", IDS_SYNC_PROMO_MESSAGE_BODY_B}, | |
| 389 { "promoMessageBodyC", IDS_SYNC_PROMO_MESSAGE_BODY_C}, | |
| 390 { "promoMessageBodyD", IDS_SYNC_PROMO_MESSAGE_BODY_D}, | |
| 387 { "promoSkipButton", IDS_SYNC_PROMO_SKIP_BUTTON}, | 391 { "promoSkipButton", IDS_SYNC_PROMO_SKIP_BUTTON}, |
| 388 { "promoAdvanced", IDS_SYNC_PROMO_ADVANCED}, | 392 { "promoAdvanced", IDS_SYNC_PROMO_ADVANCED}, |
| 389 { "promoLearnMoreShow", IDS_SYNC_PROMO_LEARN_MORE_SHOW}, | 393 { "promoLearnMoreShow", IDS_SYNC_PROMO_LEARN_MORE_SHOW}, |
| 390 { "promoLearnMoreHide", IDS_SYNC_PROMO_LEARN_MORE_HIDE}, | 394 { "promoLearnMoreHide", IDS_SYNC_PROMO_LEARN_MORE_HIDE}, |
| 391 { "promoInformation", IDS_SYNC_PROMO_INFORMATION}, | 395 { "promoInformation", IDS_SYNC_PROMO_INFORMATION}, |
| 392 }; | 396 }; |
| 393 | 397 |
| 394 RegisterStrings(localized_strings, resources, arraysize(resources)); | 398 RegisterStrings(localized_strings, resources, arraysize(resources)); |
| 395 } | 399 } |
| 396 | 400 |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 744 } | 748 } |
| 745 | 749 |
| 746 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) { | 750 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) { |
| 747 DictionaryValue args; | 751 DictionaryValue args; |
| 748 Profile* profile = Profile::FromWebUI(web_ui_); | 752 Profile* profile = Profile::FromWebUI(web_ui_); |
| 749 ProfileSyncService* service = profile->GetProfileSyncService(); | 753 ProfileSyncService* service = profile->GetProfileSyncService(); |
| 750 SyncSetupFlow::GetArgsForGaiaLogin(service, &args); | 754 SyncSetupFlow::GetArgsForGaiaLogin(service, &args); |
| 751 args.SetString("error_message", error_message); | 755 args.SetString("error_message", error_message); |
| 752 ShowGaiaLogin(args); | 756 ShowGaiaLogin(args); |
| 753 } | 757 } |
| OLD | NEW |