Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: chrome/browser/importer/importer_list.cc

Issue 6051012: Revert 70271 - Remove wstring from l10n_util. Part 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
« no previous file with comments | « chrome/browser/importer/importer_bridge.cc ('k') | chrome/browser/notifications/notification_exceptions_table_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698