diff options
Diffstat (limited to 'chrome/browser/ui/webui/sync_setup_handler.cc')
| -rw-r--r-- | chrome/browser/ui/webui/sync_setup_handler.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index 80e4c9c..8d595ec 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -199,7 +199,7 @@ void SyncSetupHandler::GetStaticLocalizedValues( content::WebUI* web_ui) { DCHECK(localized_strings); - string16 product_name(GetStringUTF16(IDS_PRODUCT_NAME)); + base::string16 product_name(GetStringUTF16(IDS_PRODUCT_NAME)); localized_strings->SetString( "chooseDataTypesInstructions", GetStringFUTF16(IDS_SYNC_CHOOSE_DATATYPES_INSTRUCTIONS, product_name)); @@ -367,7 +367,8 @@ void SyncSetupHandler::DisplayConfigureSync(bool show_advanced, base::Time passphrase_time = service->GetExplicitPassphraseTime(); syncer::PassphraseType passphrase_type = service->GetPassphraseType(); if (!passphrase_time.is_null()) { - string16 passphrase_time_str = base::TimeFormatShortDate(passphrase_time); + base::string16 passphrase_time_str = + base::TimeFormatShortDate(passphrase_time); args.SetString( "enterPassphraseBody", GetStringFUTF16(IDS_SYNC_ENTER_PASSPHRASE_BODY_WITH_DATE, |