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

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

Issue 10790075: Rename Capturer to VideoFrameCapturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased. 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
« no previous file with comments | « remoting/host/screen_recorder_unittest.cc ('k') | remoting/host/video_frame_capturer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 16 matching lines...) Expand all
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/audio_capturer.h" 36 #include "remoting/host/audio_capturer.h"
37 #include "remoting/host/capturer_fake.h" 37 #include "remoting/host/chromoting_host_context.h"
38 #include "remoting/host/chromoting_host.h" 38 #include "remoting/host/chromoting_host.h"
39 #include "remoting/host/chromoting_host_context.h"
40 #include "remoting/host/constants.h" 39 #include "remoting/host/constants.h"
41 #include "remoting/host/desktop_environment.h" 40 #include "remoting/host/desktop_environment.h"
42 #include "remoting/host/event_executor.h" 41 #include "remoting/host/event_executor.h"
43 #include "remoting/host/heartbeat_sender.h" 42 #include "remoting/host/heartbeat_sender.h"
44 #include "remoting/host/host_key_pair.h" 43 #include "remoting/host/host_key_pair.h"
45 #include "remoting/host/host_secret.h" 44 #include "remoting/host/host_secret.h"
46 #include "remoting/host/it2me_host_user_interface.h" 45 #include "remoting/host/it2me_host_user_interface.h"
47 #include "remoting/host/json_host_config.h" 46 #include "remoting/host/json_host_config.h"
48 #include "remoting/host/log_to_server.h" 47 #include "remoting/host/log_to_server.h"
49 #include "remoting/host/network_settings.h" 48 #include "remoting/host/network_settings.h"
50 #include "remoting/host/register_support_host_request.h" 49 #include "remoting/host/register_support_host_request.h"
51 #include "remoting/host/session_manager_factory.h" 50 #include "remoting/host/session_manager_factory.h"
52 #include "remoting/host/signaling_connector.h" 51 #include "remoting/host/signaling_connector.h"
52 #include "remoting/host/video_frame_capturer_fake.h"
53 #include "remoting/jingle_glue/xmpp_signal_strategy.h" 53 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
54 #include "remoting/proto/video.pb.h" 54 #include "remoting/proto/video.pb.h"
55 #include "remoting/protocol/it2me_host_authenticator_factory.h" 55 #include "remoting/protocol/it2me_host_authenticator_factory.h"
56 #include "remoting/protocol/me2me_host_authenticator_factory.h" 56 #include "remoting/protocol/me2me_host_authenticator_factory.h"
57 57
58 #if defined(TOOLKIT_GTK) 58 #if defined(TOOLKIT_GTK)
59 #include "ui/gfx/gtk_util.h" 59 #include "ui/gfx/gtk_util.h"
60 #elif defined(OS_MACOSX) 60 #elif defined(OS_MACOSX)
61 #include "base/mac/scoped_nsautorelease_pool.h" 61 #include "base/mac/scoped_nsautorelease_pool.h"
62 #elif defined(OS_WIN) 62 #elif defined(OS_WIN)
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 218
219 void StartHost() { 219 void StartHost() {
220 signal_strategy_.reset( 220 signal_strategy_.reset(
221 new XmppSignalStrategy(context_.jingle_thread(), xmpp_login_, 221 new XmppSignalStrategy(context_.jingle_thread(), xmpp_login_,
222 xmpp_auth_token_, xmpp_auth_service_)); 222 xmpp_auth_token_, xmpp_auth_service_));
223 signaling_connector_.reset(new SignalingConnector( 223 signaling_connector_.reset(new SignalingConnector(
224 signal_strategy_.get(), 224 signal_strategy_.get(),
225 base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this)))); 225 base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this))));
226 226
227 if (fake_) { 227 if (fake_) {
228 scoped_ptr<Capturer> capturer(new CapturerFake()); 228 scoped_ptr<VideoFrameCapturer> capturer(new VideoFrameCapturerFake());
229 scoped_ptr<EventExecutor> event_executor = EventExecutor::Create( 229 scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
230 context_.desktop_task_runner(), 230 context_.desktop_task_runner(),
231 context_.ui_task_runner(), capturer.get()); 231 context_.ui_task_runner(), capturer.get());
232 scoped_ptr<AudioCapturer> audio_capturer(NULL); 232 scoped_ptr<AudioCapturer> audio_capturer(NULL);
233 desktop_environment_ = DesktopEnvironment::CreateFake( 233 desktop_environment_ = DesktopEnvironment::CreateFake(
234 &context_, 234 &context_,
235 capturer.Pass(), 235 capturer.Pass(),
236 event_executor.Pass(), 236 event_executor.Pass(),
237 audio_capturer.Pass()); 237 audio_capturer.Pass());
238 } else { 238 } else {
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 max_port < 0 || max_port > 65535) { 432 max_port < 0 || max_port > 65535) {
433 LOG(ERROR) << "Invalid max-port value: " << max_port 433 LOG(ERROR) << "Invalid max-port value: " << max_port
434 << ". Expected integer in range [0, 65535]."; 434 << ". Expected integer in range [0, 65535].";
435 return 1; 435 return 1;
436 } 436 }
437 simple_host.network_settings()->max_port = max_port; 437 simple_host.network_settings()->max_port = max_port;
438 } 438 }
439 439
440 return simple_host.Run(); 440 return simple_host.Run();
441 } 441 }
OLDNEW
« no previous file with comments | « remoting/host/screen_recorder_unittest.cc ('k') | remoting/host/video_frame_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698