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

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

Issue 6461023: Fix up mac test client and simple host for remoting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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 | « base/message_pump_mac.mm ('k') | remoting/protocol/protocol_test_client.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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.
11 // 2. Accepts connection through libjingle. 11 // 2. Accepts connection through libjingle.
12 // 3. Receive mouse / keyboard events through libjingle. 12 // 3. Receive mouse / keyboard events through libjingle.
13 // 4. Sends screen capture through libjingle. 13 // 4. Sends screen capture through libjingle.
14 14
15 #include <iostream> 15 #include <iostream>
16 #include <string> 16 #include <string>
17 #include <stdlib.h> 17 #include <stdlib.h>
18 18
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 20
21 #include "base/at_exit.h" 21 #include "base/at_exit.h"
22 #include "base/command_line.h" 22 #include "base/command_line.h"
23 #include "base/environment.h" 23 #include "base/environment.h"
24 #include "base/file_path.h" 24 #include "base/file_path.h"
25 #include "base/logging.h" 25 #include "base/logging.h"
26 #include "base/mac/scoped_nsautorelease_pool.h" 26 #include "base/mac/scoped_nsautorelease_pool.h"
27 #include "base/nss_util.h" 27 #include "base/nss_util.h"
28 #include "base/path_service.h" 28 #include "base/path_service.h"
29 #include "base/test/mock_chrome_application_mac.h"
29 #include "base/threading/thread.h" 30 #include "base/threading/thread.h"
30 #include "media/base/media.h" 31 #include "media/base/media.h"
31 #include "remoting/base/tracer.h" 32 #include "remoting/base/tracer.h"
32 #include "remoting/host/capturer_fake.h" 33 #include "remoting/host/capturer_fake.h"
33 #include "remoting/host/chromoting_host.h" 34 #include "remoting/host/chromoting_host.h"
34 #include "remoting/host/chromoting_host_context.h" 35 #include "remoting/host/chromoting_host_context.h"
35 #include "remoting/host/event_executor.h" 36 #include "remoting/host/event_executor.h"
36 #include "remoting/host/json_host_config.h" 37 #include "remoting/host/json_host_config.h"
37 #include "remoting/proto/video.pb.h" 38 #include "remoting/proto/video.pb.h"
38 39
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 } else { 148 } else {
148 LOG(ERROR) << "Unknown video codec: " << video_codec; 149 LOG(ERROR) << "Unknown video codec: " << video_codec;
149 context.Stop(); 150 context.Stop();
150 return 1; 151 return 1;
151 } 152 }
152 config->mutable_video_configs()->push_back(ChannelConfig( 153 config->mutable_video_configs()->push_back(ChannelConfig(
153 transport, remoting::protocol::kDefaultStreamVersion, codec)); 154 transport, remoting::protocol::kDefaultStreamVersion, codec));
154 host->set_protocol_config(config.release()); 155 host->set_protocol_config(config.release());
155 } 156 }
156 157
158 #if defined(OS_MACOSX)
159 mock_cr_app::RegisterMockCrApp();
160 #endif // OS_MACOSX
161
157 // Let the chromoting host run until the shutdown task is executed. 162 // Let the chromoting host run until the shutdown task is executed.
158 MessageLoop message_loop(MessageLoop::TYPE_UI); 163 MessageLoop message_loop(MessageLoop::TYPE_UI);
159 host->Start(NewRunnableFunction(&ShutdownTask, &message_loop)); 164 host->Start(NewRunnableFunction(&ShutdownTask, &message_loop));
160 message_loop.Run(); 165 message_loop.Run();
161 166
162 // And then stop the chromoting context. 167 // And then stop the chromoting context.
163 context.Stop(); 168 context.Stop();
164 file_io_thread.Stop(); 169 file_io_thread.Stop();
165 return 0; 170 return 0;
166 } 171 }
OLDNEW
« no previous file with comments | « base/message_pump_mac.mm ('k') | remoting/protocol/protocol_test_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698