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

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

Issue 10696134: remoting/host: Rename Capturer to VideoFrameCapturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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) 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 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 15 matching lines...) Expand all
26 #include "base/logging.h" 26 #include "base/logging.h"
27 #include "base/message_loop.h" 27 #include "base/message_loop.h"
28 #include "base/path_service.h" 28 #include "base/path_service.h"
29 #include "base/string_number_conversions.h" 29 #include "base/string_number_conversions.h"
30 #include "base/utf_string_conversions.h" 30 #include "base/utf_string_conversions.h"
31 #include "base/threading/thread.h" 31 #include "base/threading/thread.h"
32 #include "crypto/nss_util.h" 32 #include "crypto/nss_util.h"
33 #include "net/base/network_change_notifier.h" 33 #include "net/base/network_change_notifier.h"
34 #include "net/socket/ssl_server_socket.h" 34 #include "net/socket/ssl_server_socket.h"
35 #include "remoting/base/constants.h" 35 #include "remoting/base/constants.h"
36 #include "remoting/host/capturer_fake.h" 36 #include "remoting/host/video_frame_capturer_fake.h"
37 #include "remoting/host/chromoting_host.h" 37 #include "remoting/host/chromoting_host.h"
38 #include "remoting/host/chromoting_host_context.h" 38 #include "remoting/host/chromoting_host_context.h"
39 #include "remoting/host/constants.h" 39 #include "remoting/host/constants.h"
40 #include "remoting/host/desktop_environment.h" 40 #include "remoting/host/desktop_environment.h"
41 #include "remoting/host/event_executor.h" 41 #include "remoting/host/event_executor.h"
42 #include "remoting/host/heartbeat_sender.h" 42 #include "remoting/host/heartbeat_sender.h"
43 #include "remoting/host/host_key_pair.h" 43 #include "remoting/host/host_key_pair.h"
44 #include "remoting/host/host_secret.h" 44 #include "remoting/host/host_secret.h"
45 #include "remoting/host/it2me_host_user_interface.h" 45 #include "remoting/host/it2me_host_user_interface.h"
46 #include "remoting/host/json_host_config.h" 46 #include "remoting/host/json_host_config.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 217
218 void StartHost() { 218 void StartHost() {
219 signal_strategy_.reset( 219 signal_strategy_.reset(
220 new XmppSignalStrategy(context_.jingle_thread(), xmpp_login_, 220 new XmppSignalStrategy(context_.jingle_thread(), xmpp_login_,
221 xmpp_auth_token_, xmpp_auth_service_)); 221 xmpp_auth_token_, xmpp_auth_service_));
222 signaling_connector_.reset(new SignalingConnector( 222 signaling_connector_.reset(new SignalingConnector(
223 signal_strategy_.get(), 223 signal_strategy_.get(),
224 base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this)))); 224 base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this))));
225 225
226 if (fake_) { 226 if (fake_) {
227 scoped_ptr<Capturer> capturer(new CapturerFake()); 227 scoped_ptr<VideoFrameCapturer> capturer(new VideoFrameCapturerFake());
228 scoped_ptr<EventExecutor> event_executor = EventExecutor::Create( 228 scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
229 context_.desktop_task_runner(), 229 context_.desktop_task_runner(),
230 context_.ui_task_runner(), capturer.get()); 230 context_.ui_task_runner(), capturer.get());
231 desktop_environment_ = DesktopEnvironment::CreateFake( 231 desktop_environment_ = DesktopEnvironment::CreateFake(
232 &context_, capturer.Pass(), event_executor.Pass()); 232 &context_, capturer.Pass(), event_executor.Pass());
233 } else { 233 } else {
234 desktop_environment_ = DesktopEnvironment::Create(&context_); 234 desktop_environment_ = DesktopEnvironment::Create(&context_);
235 } 235 }
236 236
237 host_ = new ChromotingHost( 237 host_ = new ChromotingHost(
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 max_port < 0 || max_port > 65535) { 427 max_port < 0 || max_port > 65535) {
428 LOG(ERROR) << "Invalid max-port value: " << max_port 428 LOG(ERROR) << "Invalid max-port value: " << max_port
429 << ". Expected integer in range [0, 65535]."; 429 << ". Expected integer in range [0, 65535].";
430 return 1; 430 return 1;
431 } 431 }
432 simple_host.network_settings()->max_port = max_port; 432 simple_host.network_settings()->max_port = max_port;
433 } 433 }
434 434
435 return simple_host.Run(); 435 return simple_host.Run();
436 } 436 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698