diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 18:38:51 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 18:38:51 +0000 |
| commit | d5c45b71091a6a70cb051bdcd35a125e3fba6729 (patch) | |
| tree | 276bbb5f6ce2c27ab602be95093dd0dfbbc14039 /chrome/browser/process_singleton_linux.cc | |
| parent | 72cf2cbaab582d550edb3a5931b6c478e1b685f2 (diff) | |
| download | chromium_src-d5c45b71091a6a70cb051bdcd35a125e3fba6729.zip chromium_src-d5c45b71091a6a70cb051bdcd35a125e3fba6729.tar.gz chromium_src-d5c45b71091a6a70cb051bdcd35a125e3fba6729.tar.bz2 | |
Remove wstring from l10n_util. Part 4.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/5958017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_linux.cc')
| -rw-r--r-- | chrome/browser/process_singleton_linux.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index acf982d..982f370 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -298,16 +298,17 @@ bool ParseLockPath(const FilePath& path, void DisplayProfileInUseError(const std::string& lock_path, const std::string& hostname, int pid) { - std::wstring error = l10n_util::GetStringF(IDS_PROFILE_IN_USE_LINUX, - UTF8ToWide(base::IntToString(pid)), - ASCIIToWide(hostname), - base::SysNativeMBToWide(lock_path), - l10n_util::GetString(IDS_PRODUCT_NAME)); - LOG(ERROR) << base::SysWideToNativeMB(error).c_str(); + string16 error = l10n_util::GetStringFUTF16( + IDS_PROFILE_IN_USE_LINUX, + base::IntToString16(pid), + ASCIIToUTF16(hostname), + WideToUTF16(base::SysNativeMBToWide(lock_path)), + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); + LOG(ERROR) << base::SysWideToNativeMB(UTF16ToWide(error)).c_str(); #if defined(TOOLKIT_GTK) if (!CommandLine::ForCurrentProcess()->HasSwitch( switches::kNoProcessSingletonDialog)) - ProcessSingletonDialog::ShowAndRun(WideToUTF8(error)); + ProcessSingletonDialog::ShowAndRun(UTF16ToUTF8(error)); #endif } |