Chromium Code Reviews| Index: chrome/browser/ui/webui/sync_setup_handler.cc |
| =================================================================== |
| --- chrome/browser/ui/webui/sync_setup_handler.cc (revision 111699) |
| +++ chrome/browser/ui/webui/sync_setup_handler.cc (working copy) |
| @@ -23,6 +23,7 @@ |
| #include "chrome/browser/sync/sync_setup_flow.h" |
| #include "chrome/browser/sync/util/oauth.h" |
| #include "chrome/browser/ui/browser_list.h" |
| +#include "chrome/browser/ui/webui/sync_promo_trial.h" |
| #include "chrome/browser/ui/webui/sync_promo_ui.h" |
| #include "chrome/common/net/gaia/gaia_constants.h" |
| #include "chrome/common/pref_names.h" |
| @@ -257,11 +258,12 @@ |
| } |
| void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) { |
| - GetStaticLocalizedValues(localized_strings); |
| + GetStaticLocalizedValues(localized_strings, web_ui_); |
| } |
| void SyncSetupHandler::GetStaticLocalizedValues( |
| - DictionaryValue* localized_strings) { |
| + DictionaryValue* localized_strings, |
| + WebUI* web_ui) { |
| DCHECK(localized_strings); |
| localized_strings->SetString( |
| @@ -303,6 +305,21 @@ |
| GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE, |
| GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); |
| + // The experimental body string only appears if we are on the launch page |
| + // version of the Sync Promo. |
| + // TODO(stevet): This doesn't jive well with |
| + // NTPResourceCache::CreateNewTabHTML, which is incapable of passing the |
|
sail
2011/11/28 20:44:04
I think you can remove this comment now.
SteveT
2011/11/28 22:11:15
Done.
|
| + // web_ui member to us. Either confirm that this doesn't matter (we don't show |
| + // this string in the NTP, anyway) or find a way to make this cacheable. |
| + int message_body_resource_id = IDS_SYNC_PROMO_MESSAGE_BODY_A; |
| + if (web_ui && SyncPromoUI::GetIsLaunchPageForSyncPromoURL( |
| + web_ui->tab_contents()->GetURL())) { |
| + message_body_resource_id = SyncPromoTrial::GetMessageBodyResID(); |
| + } |
| + localized_strings->SetString( |
| + "promoMessageBody", |
| + GetStringUTF16(message_body_resource_id)); |
| + |
| std::string create_account_url = |
| google_util::StringAppendGoogleLocaleParam(kCreateNewAccountUrl); |
| string16 create_account = GetStringUTF16(IDS_SYNC_CREATE_ACCOUNT); |
| @@ -383,7 +400,6 @@ |
| { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA }, |
| { "aspWarningText", IDS_SYNC_ASP_PASSWORD_WARNING_TEXT }, |
| { "promoPageTitle", IDS_SYNC_PROMO_TAB_TITLE}, |
| - { "promoMessageBody", IDS_SYNC_PROMO_MESSAGE_BODY}, |
| { "promoSkipButton", IDS_SYNC_PROMO_SKIP_BUTTON}, |
| { "promoAdvanced", IDS_SYNC_PROMO_ADVANCED}, |
| { "promoLearnMoreShow", IDS_SYNC_PROMO_LEARN_MORE_SHOW}, |