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

Unified Diff: chrome/browser/process_singleton_linux.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months 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/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));
« no previous file with comments | « chrome/browser/printing/printing_layout_browsertest.cc ('k') | chrome/browser/search_engines/template_url_prepopulate_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698