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

Unified Diff: remoting/host/desktop_session_win.cc

Issue 121123002: Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « remoting/host/clipboard_win.cc ('k') | remoting/host/disconnect_window_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_win.cc
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc
index 8691d0e49b7a06f61be1fb454e67aef6ef67f16c..77e024f41feef6b7176de5f0fb03f6b8ff8f741b 100644
--- a/remoting/host/desktop_session_win.cc
+++ b/remoting/host/desktop_session_win.cc
@@ -256,7 +256,7 @@ bool RdpSession::Initialize(const ScreenResolution& resolution) {
base::win::ScopedComPtr<IRdpDesktopSessionEventHandler> event_handler(
new EventHandler(weak_factory_.GetWeakPtr()));
terminal_id_ = base::GenerateGUID();
- base::win::ScopedBstr terminal_id(UTF8ToUTF16(terminal_id_).c_str());
+ base::win::ScopedBstr terminal_id(base::UTF8ToUTF16(terminal_id_).c_str());
result = rdp_desktop_session_->Connect(host_size.width(),
host_size.height(),
terminal_id,
@@ -544,7 +544,8 @@ void DesktopSessionWin::OnSessionAttached(uint32 session_id) {
new WtsSessionProcessDelegate(io_task_runner_,
target.Pass(),
launch_elevated,
- WideToUTF8(kDaemonIpcSecurityDescriptor)));
+ base::WideToUTF8(
+ kDaemonIpcSecurityDescriptor)));
if (!delegate->Initialize(session_id)) {
TerminateSession();
return;
« no previous file with comments | « remoting/host/clipboard_win.cc ('k') | remoting/host/disconnect_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698