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

Side by Side Diff: remoting/host/desktop_process.cc

Issue 2529533003: Pass DesktopEnvironmentOptions form network to desktop process. (Closed)
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This file implements the Windows service controlling Me2Me host processes 5 // This file implements the Windows service controlling Me2Me host processes
6 // running within user sessions. 6 // running within user sessions.
7 7
8 #include "remoting/host/desktop_process.h" 8 #include "remoting/host/desktop_process.h"
9 9
10 #include <utility> 10 #include <utility>
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 AutoThread::CreateWithLoopAndComInitTypes("ChromotingAudioThread", 132 AutoThread::CreateWithLoopAndComInitTypes("ChromotingAudioThread",
133 caller_task_runner_, 133 caller_task_runner_,
134 base::MessageLoop::TYPE_UI, 134 base::MessageLoop::TYPE_UI,
135 AutoThread::COM_INIT_STA); 135 AutoThread::COM_INIT_STA);
136 #else // !defined(OS_WIN) 136 #else // !defined(OS_WIN)
137 audio_task_runner = AutoThread::CreateWithType( 137 audio_task_runner = AutoThread::CreateWithType(
138 "ChromotingAudioThread", caller_task_runner_, base::MessageLoop::TYPE_IO); 138 "ChromotingAudioThread", caller_task_runner_, base::MessageLoop::TYPE_IO);
139 #endif // !defined(OS_WIN) 139 #endif // !defined(OS_WIN)
140 140
141 // Create a desktop agent. 141 // Create a desktop agent.
142 desktop_agent_ = new DesktopSessionAgent( 142 desktop_agent_ =
143 audio_task_runner, caller_task_runner_, input_task_runner_, 143 new DesktopSessionAgent(audio_task_runner, caller_task_runner_,
144 io_task_runner_, DesktopEnvironmentOptions::CreateDefault()); 144 input_task_runner_, io_task_runner_);
145 145
146 // Start the agent and create an IPC channel to talk to it. 146 // Start the agent and create an IPC channel to talk to it.
147 mojo::ScopedMessagePipeHandle desktop_pipe = 147 mojo::ScopedMessagePipeHandle desktop_pipe =
148 desktop_agent_->Start(AsWeakPtr()); 148 desktop_agent_->Start(AsWeakPtr());
149 149
150 // Connect to the daemon. 150 // Connect to the daemon.
151 daemon_channel_ = IPC::ChannelProxy::Create(daemon_channel_handle_.release(), 151 daemon_channel_ = IPC::ChannelProxy::Create(daemon_channel_handle_.release(),
152 IPC::Channel::MODE_CLIENT, this, 152 IPC::Channel::MODE_CLIENT, this,
153 io_task_runner_); 153 io_task_runner_);
154 154
(...skipping 11 matching lines...) Expand all
166 base::snprintf(message, sizeof(message), 166 base::snprintf(message, sizeof(message),
167 "Requested by %s at %s, line %d.", 167 "Requested by %s at %s, line %d.",
168 function_name.c_str(), file_name.c_str(), line_number); 168 function_name.c_str(), file_name.c_str(), line_number);
169 base::debug::Alias(message); 169 base::debug::Alias(message);
170 170
171 // The daemon requested us to crash the process. 171 // The daemon requested us to crash the process.
172 CHECK(false) << message; 172 CHECK(false) << message;
173 } 173 }
174 174
175 } // namespace remoting 175 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698