OLD | NEW |
---|---|
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 // TODO(ajwong): We need to come up with a better description of the | 5 // TODO(ajwong): We need to come up with a better description of the |
6 // responsibilities for each thread. | 6 // responsibilities for each thread. |
7 | 7 |
8 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ | 8 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ |
9 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ | 9 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ |
10 | 10 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
46 class Module; | 46 class Module; |
47 } // namespace pp | 47 } // namespace pp |
48 | 48 |
49 namespace remoting { | 49 namespace remoting { |
50 | 50 |
51 namespace protocol { | 51 namespace protocol { |
52 class InputEventTracker; | 52 class InputEventTracker; |
53 class MouseInputFilter; | 53 class MouseInputFilter; |
54 } // namespace protocol | 54 } // namespace protocol |
55 | 55 |
56 class AudioDecodeScheduler; | |
Sergey Ulanov
2012/08/03 17:59:55
don't need this/
kxing
2012/08/03 20:55:13
Done.
| |
56 class ChromotingClient; | 57 class ChromotingClient; |
57 class ChromotingStats; | 58 class ChromotingStats; |
58 class ClientContext; | 59 class ClientContext; |
59 class FrameConsumerProxy; | 60 class FrameConsumerProxy; |
60 class PepperAudioPlayer; | 61 class PepperAudioPlayer; |
61 class PepperInputHandler; | 62 class PepperInputHandler; |
62 class PepperView; | 63 class PepperView; |
63 class PepperXmppProxy; | 64 class PepperXmppProxy; |
64 class RectangleUpdateDecoder; | 65 class RectangleUpdateDecoder; |
65 | 66 |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
184 | 185 |
185 bool initialized_; | 186 bool initialized_; |
186 | 187 |
187 PepperPluginThreadDelegate plugin_thread_delegate_; | 188 PepperPluginThreadDelegate plugin_thread_delegate_; |
188 scoped_refptr<PluginThreadTaskRunner> plugin_task_runner_; | 189 scoped_refptr<PluginThreadTaskRunner> plugin_task_runner_; |
189 ClientContext context_; | 190 ClientContext context_; |
190 scoped_ptr<protocol::ConnectionToHost> host_connection_; | 191 scoped_ptr<protocol::ConnectionToHost> host_connection_; |
191 scoped_ptr<PepperView> view_; | 192 scoped_ptr<PepperView> view_; |
192 | 193 |
193 scoped_refptr<RectangleUpdateDecoder> rectangle_decoder_; | 194 scoped_refptr<RectangleUpdateDecoder> rectangle_decoder_; |
195 scoped_ptr<AudioDecodeScheduler> audio_decode_scheduler_; | |
Sergey Ulanov
2012/08/03 17:59:55
remove this line.
kxing
2012/08/03 20:55:13
Done.
| |
194 | 196 |
195 scoped_ptr<protocol::MouseInputFilter> mouse_input_filter_; | 197 scoped_ptr<protocol::MouseInputFilter> mouse_input_filter_; |
196 scoped_ptr<protocol::InputEventTracker> input_tracker_; | 198 scoped_ptr<protocol::InputEventTracker> input_tracker_; |
197 #if defined(OS_MACOSX) | 199 #if defined(OS_MACOSX) |
198 scoped_ptr<MacKeyEventProcessor> mac_key_event_processor_; | 200 scoped_ptr<MacKeyEventProcessor> mac_key_event_processor_; |
199 #endif | 201 #endif |
200 KeyEventMapper key_mapper_; | 202 KeyEventMapper key_mapper_; |
201 scoped_ptr<PepperInputHandler> input_handler_; | 203 scoped_ptr<PepperInputHandler> input_handler_; |
202 scoped_ptr<PepperAudioPlayer> audio_player_; | |
203 scoped_ptr<ChromotingClient> client_; | 204 scoped_ptr<ChromotingClient> client_; |
204 | 205 |
205 // XmppProxy is a refcounted interface used to perform thread-switching and | 206 // XmppProxy is a refcounted interface used to perform thread-switching and |
206 // detaching between objects whose lifetimes are controlled by pepper, and | 207 // detaching between objects whose lifetimes are controlled by pepper, and |
207 // jingle_glue objects. This is used when if we start a sandboxed jingle | 208 // jingle_glue objects. This is used when if we start a sandboxed jingle |
208 // connection. | 209 // connection. |
209 scoped_refptr<PepperXmppProxy> xmpp_proxy_; | 210 scoped_refptr<PepperXmppProxy> xmpp_proxy_; |
210 | 211 |
211 base::WeakPtrFactory<ChromotingInstance> weak_factory_; | 212 base::WeakPtrFactory<ChromotingInstance> weak_factory_; |
212 | 213 |
213 DISALLOW_COPY_AND_ASSIGN(ChromotingInstance); | 214 DISALLOW_COPY_AND_ASSIGN(ChromotingInstance); |
214 }; | 215 }; |
215 | 216 |
216 } // namespace remoting | 217 } // namespace remoting |
217 | 218 |
218 #endif // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ | 219 #endif // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ |
OLD | NEW |