| Index: remoting/host/win/launch_process_with_token.cc
|
| diff --git a/remoting/host/win/launch_process_with_token.cc b/remoting/host/win/launch_process_with_token.cc
|
| index 6cb7e3168c4836f3f80d90ac7a3db0a2e9273111..6251ab9f47d1780c1049574766634c3578c41738 100644
|
| --- a/remoting/host/win/launch_process_with_token.cc
|
| +++ b/remoting/host/win/launch_process_with_token.cc
|
| @@ -290,7 +290,7 @@ bool SendCreateProcessRequest(
|
| const base::FilePath::StringType& application_name,
|
| const CommandLine::StringType& command_line,
|
| DWORD creation_flags,
|
| - const char16* desktop_name) {
|
| + const base::char16* desktop_name) {
|
| // |CreateProcessRequest| structure passes the same parameters to
|
| // the execution server as CreateProcessAsUser() function does. Strings are
|
| // stored as wide strings immediately after the structure. String pointers are
|
| @@ -373,7 +373,7 @@ bool CreateRemoteSessionProcess(
|
| const base::FilePath::StringType& application_name,
|
| const CommandLine::StringType& command_line,
|
| DWORD creation_flags,
|
| - const char16* desktop_name,
|
| + const base::char16* desktop_name,
|
| PROCESS_INFORMATION* process_information_out)
|
| {
|
| DCHECK_LT(base::win::GetVersion(), base::win::VERSION_VISTA);
|
| @@ -456,7 +456,7 @@ bool LaunchProcessWithToken(const base::FilePath& binary,
|
| SECURITY_ATTRIBUTES* thread_attributes,
|
| bool inherit_handles,
|
| DWORD creation_flags,
|
| - const char16* desktop_name,
|
| + const base::char16* desktop_name,
|
| ScopedHandle* process_out,
|
| ScopedHandle* thread_out) {
|
| base::FilePath::StringType application_name = binary.value();
|
| @@ -465,7 +465,7 @@ bool LaunchProcessWithToken(const base::FilePath& binary,
|
| memset(&startup_info, 0, sizeof(startup_info));
|
| startup_info.cb = sizeof(startup_info);
|
| if (desktop_name)
|
| - startup_info.lpDesktop = const_cast<char16*>(desktop_name);
|
| + startup_info.lpDesktop = const_cast<base::char16*>(desktop_name);
|
|
|
| PROCESS_INFORMATION temp_process_info = {};
|
| BOOL result = CreateProcessAsUser(user_token,
|
|
|