| Index: chrome/browser/process_singleton_linux.cc
|
| diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc
|
| index fecbda9256c78239e3b9dcee67527db8cf7f4cd5..1e7990d09c86837c01a7853658e140e2562a4181 100644
|
| --- a/chrome/browser/process_singleton_linux.cc
|
| +++ b/chrome/browser/process_singleton_linux.cc
|
| @@ -302,9 +302,9 @@ void DisplayProfileInUseError(const std::string& lock_path,
|
| IDS_PROFILE_IN_USE_LINUX,
|
| base::IntToString16(pid),
|
| ASCIIToUTF16(hostname),
|
| - WideToUTF16(base::SysNativeMBToWide(lock_path)),
|
| + base::WideToUTF16(base::SysNativeMBToWide(lock_path)),
|
| l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
|
| - LOG(ERROR) << base::SysWideToNativeMB(UTF16ToWide(error)).c_str();
|
| + LOG(ERROR) << base::SysWideToNativeMB(base::UTF16ToWide(error)).c_str();
|
| if (!g_disable_prompt) {
|
| #if defined(TOOLKIT_GTK)
|
| ProcessSingletonDialog::ShowAndRun(UTF16ToUTF8(error));
|
|
|