| Index: chrome/browser/importer/importer_list.cc
|
| ===================================================================
|
| --- chrome/browser/importer/importer_list.cc (revision 70280)
|
| +++ chrome/browser/importer/importer_list.cc (working copy)
|
| @@ -51,8 +51,7 @@
|
|
|
| importer::ProfileInfo* safari = new importer::ProfileInfo();
|
| safari->browser_type = importer::SAFARI;
|
| - safari->description =
|
| - UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_IMPORT_FROM_SAFARI));
|
| + safari->description = l10n_util::GetString(IDS_IMPORT_FROM_SAFARI);
|
| safari->source_path.clear();
|
| safari->app_path.clear();
|
| safari->services_supported = items;
|
| @@ -85,8 +84,7 @@
|
| }
|
|
|
| importer::ProfileInfo* firefox = new importer::ProfileInfo();
|
| - firefox->description =
|
| - UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_IMPORT_FROM_FIREFOX));
|
| + firefox->description = l10n_util::GetString(IDS_IMPORT_FROM_FIREFOX);
|
| firefox->browser_type = firefox_type;
|
| firefox->source_path = profile_path;
|
| #if defined(OS_WIN)
|
| @@ -107,8 +105,8 @@
|
|
|
| importer::ProfileInfo* google_toolbar = new importer::ProfileInfo();
|
| google_toolbar->browser_type = importer::GOOGLE_TOOLBAR5;
|
| - google_toolbar->description = UTF16ToWideHack(l10n_util::GetStringUTF16(
|
| - IDS_IMPORT_FROM_GOOGLE_TOOLBAR));
|
| + google_toolbar->description = l10n_util::GetString(
|
| + IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
|
| google_toolbar->source_path.clear();
|
| google_toolbar->app_path.clear();
|
| google_toolbar->services_supported = importer::FAVORITES;
|
|
|