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

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

Issue 7312019: Chromoting: Move host input and window mgmt into DesktopEnvironment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 is an application of a minimal host process in a Chromoting 5 // This is an application of a minimal host process in a Chromoting
6 // system. It serves the purpose of gluing different pieces together 6 // system. It serves the purpose of gluing different pieces together
7 // to make a functional host process for testing. 7 // to make a functional host process for testing.
8 // 8 //
9 // It peforms the following functionality: 9 // It peforms the following functionality:
10 // 1. Connect to the GTalk network and register the machine as a host. 10 // 1. Connect to the GTalk network and register the machine as a host.
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 capturer); 183 capturer);
184 remoting::Curtain* curtain = remoting::Curtain::Create(); 184 remoting::Curtain* curtain = remoting::Curtain::Create();
185 remoting::DisconnectWindow* disconnect_window = 185 remoting::DisconnectWindow* disconnect_window =
186 remoting::DisconnectWindow::Create(); 186 remoting::DisconnectWindow::Create();
187 remoting::ContinueWindow* continue_window = 187 remoting::ContinueWindow* continue_window =
188 remoting::ContinueWindow::Create(); 188 remoting::ContinueWindow::Create();
189 remoting::LocalInputMonitor* local_input_monitor = 189 remoting::LocalInputMonitor* local_input_monitor =
190 remoting::LocalInputMonitor::Create(); 190 remoting::LocalInputMonitor::Create();
191 host = ChromotingHost::Create( 191 host = ChromotingHost::Create(
192 &context, config, 192 &context, config,
193 new DesktopEnvironment(capturer, event_executor, curtain, 193 new DesktopEnvironment(&context, capturer, event_executor, curtain,
194 disconnect_window, continue_window, 194 disconnect_window, continue_window,
195 local_input_monitor), 195 local_input_monitor),
196 access_verifier.release()); 196 access_verifier.release());
197 } else { 197 } else {
198 host = ChromotingHost::Create(&context, config, 198 host = ChromotingHost::Create(&context, config,
199 access_verifier.release()); 199 access_verifier.release());
200 } 200 }
201 host->set_it2me(is_it2me_); 201 host->set_it2me(is_it2me_);
202 202
203 if (protocol_config_.get()) { 203 if (protocol_config_.get()) {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 LOG(ERROR) << "Unknown video codec: " << video_codec; 309 LOG(ERROR) << "Unknown video codec: " << video_codec;
310 return 1; 310 return 1;
311 } 311 }
312 config->mutable_video_configs()->push_back(ChannelConfig( 312 config->mutable_video_configs()->push_back(ChannelConfig(
313 transport, remoting::protocol::kDefaultStreamVersion, codec)); 313 transport, remoting::protocol::kDefaultStreamVersion, codec));
314 simple_host.set_protocol_config(config.release()); 314 simple_host.set_protocol_config(config.release());
315 } 315 }
316 316
317 return simple_host.Run(); 317 return simple_host.Run();
318 } 318 }
OLDNEW
« remoting/host/desktop_environment.cc ('K') | « remoting/host/desktop_environment.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698