diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:10:13 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:10:13 +0000 |
| commit | 1308ac961fdd5148ce95e228fe192175584a5464 (patch) | |
| tree | 08f1e60a5b15a97aca4b24d1dd4e92e0dd1dc6ca /chrome/browser/importer | |
| parent | d546c48d90f0eaa592794f59e6a970b7b027db86 (diff) | |
| download | chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.zip chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.tar.gz chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.tar.bz2 | |
Revert 70271 - Remove wstring from l10n_util. Part 3.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044006
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6051012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/importer_bridge.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/importer/importer_list.cc | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/importer/importer_bridge.cc b/chrome/browser/importer/importer_bridge.cc index 588e365..f4fce91 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 UTF16ToWideHack(l10n_util::GetStringUTF16(message_id)); + return l10n_util::GetString(message_id); } InProcessImporterBridge::~InProcessImporterBridge() {} diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index 5579725..10e1101 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -51,8 +51,7 @@ void DetectSafariProfiles(std::vector<importer::ProfileInfo*>* profiles) { 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 @@ void DetectFirefoxProfiles(std::vector<importer::ProfileInfo*>* profiles) { } 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 @@ void DetectGoogleToolbarProfiles( 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; |