summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/importer_bridge.cc2
-rw-r--r--chrome/browser/importer/importer_list.cc10
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/importer/importer_bridge.cc b/chrome/browser/importer/importer_bridge.cc
index f4fce91..588e365 100644
--- a/chrome/browser/importer/importer_bridge.cc
+++ b/chrome/browser/importer/importer_bridge.cc
@@ -117,7 +117,7 @@ void InProcessImporterBridge::NotifyEnded() {
}
std::wstring InProcessImporterBridge::GetLocalizedString(int message_id) {
- return l10n_util::GetString(message_id);
+ return UTF16ToWideHack(l10n_util::GetStringUTF16(message_id));
}
InProcessImporterBridge::~InProcessImporterBridge() {}
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc
index 10e1101..5579725 100644
--- a/chrome/browser/importer/importer_list.cc
+++ b/chrome/browser/importer/importer_list.cc
@@ -51,7 +51,8 @@ void DetectSafariProfiles(std::vector<importer::ProfileInfo*>* profiles) {
importer::ProfileInfo* safari = new importer::ProfileInfo();
safari->browser_type = importer::SAFARI;
- safari->description = l10n_util::GetString(IDS_IMPORT_FROM_SAFARI);
+ safari->description =
+ UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_IMPORT_FROM_SAFARI));
safari->source_path.clear();
safari->app_path.clear();
safari->services_supported = items;
@@ -84,7 +85,8 @@ void DetectFirefoxProfiles(std::vector<importer::ProfileInfo*>* profiles) {
}
importer::ProfileInfo* firefox = new importer::ProfileInfo();
- firefox->description = l10n_util::GetString(IDS_IMPORT_FROM_FIREFOX);
+ firefox->description =
+ UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_IMPORT_FROM_FIREFOX));
firefox->browser_type = firefox_type;
firefox->source_path = profile_path;
#if defined(OS_WIN)
@@ -105,8 +107,8 @@ void DetectGoogleToolbarProfiles(
importer::ProfileInfo* google_toolbar = new importer::ProfileInfo();
google_toolbar->browser_type = importer::GOOGLE_TOOLBAR5;
- google_toolbar->description = l10n_util::GetString(
- IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
+ google_toolbar->description = UTF16ToWideHack(l10n_util::GetStringUTF16(
+ IDS_IMPORT_FROM_GOOGLE_TOOLBAR));
google_toolbar->source_path.clear();
google_toolbar->app_path.clear();
google_toolbar->services_supported = importer::FAVORITES;