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

Side by Side Diff: remoting/client/plugin/chromoting_instance.h

Issue 2052723002: Adding an interface to allow extention of the audio player for CRD and iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments in CL. Created 4 years, 6 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
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 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ 5 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
6 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ 6 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } // namespace jingle_glue 53 } // namespace jingle_glue
54 54
55 namespace webrtc { 55 namespace webrtc {
56 class DesktopRegion; 56 class DesktopRegion;
57 class DesktopSize; 57 class DesktopSize;
58 class DesktopVector; 58 class DesktopVector;
59 } // namespace webrtc 59 } // namespace webrtc
60 60
61 namespace remoting { 61 namespace remoting {
62 62
63 class PepperAudioPlayer;
63 class ChromotingClient; 64 class ChromotingClient;
64 class ClientContext; 65 class ClientContext;
65 class DelegatingSignalStrategy; 66 class DelegatingSignalStrategy;
66 class PepperAudioPlayer; 67 class PepperAudioPlayer;
67 class PepperMouseLocker; 68 class PepperMouseLocker;
68 69
69 class ChromotingInstance : public ClientUserInterface, 70 class ChromotingInstance : public ClientUserInterface,
70 public PepperVideoRenderer::EventHandler, 71 public PepperVideoRenderer::EventHandler,
71 public protocol::ClipboardStub, 72 public protocol::ClipboardStub,
72 public protocol::CursorShapeStub, 73 public protocol::CursorShapeStub,
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 bool pairing_supported, 242 bool pairing_supported,
242 const protocol::SecretFetchedCallback& secret_fetched_callback); 243 const protocol::SecretFetchedCallback& secret_fetched_callback);
243 244
244 bool initialized_; 245 bool initialized_;
245 246
246 scoped_refptr<base::SingleThreadTaskRunner> plugin_task_runner_; 247 scoped_refptr<base::SingleThreadTaskRunner> plugin_task_runner_;
247 std::unique_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_; 248 std::unique_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
248 std::unique_ptr<jingle_glue::JingleThreadWrapper> thread_wrapper_; 249 std::unique_ptr<jingle_glue::JingleThreadWrapper> thread_wrapper_;
249 ClientContext context_; 250 ClientContext context_;
250 protocol::PerformanceTracker perf_tracker_; 251 protocol::PerformanceTracker perf_tracker_;
252 std::unique_ptr<PepperAudioPlayer> audio_player_;
251 std::unique_ptr<PepperVideoRenderer> video_renderer_; 253 std::unique_ptr<PepperVideoRenderer> video_renderer_;
252 pp::View plugin_view_; 254 pp::View plugin_view_;
253 255
254 // Contains the most-recently-reported desktop shape, if any. 256 // Contains the most-recently-reported desktop shape, if any.
255 std::unique_ptr<webrtc::DesktopRegion> desktop_shape_; 257 std::unique_ptr<webrtc::DesktopRegion> desktop_shape_;
256 258
257 std::unique_ptr<DelegatingSignalStrategy> signal_strategy_; 259 std::unique_ptr<DelegatingSignalStrategy> signal_strategy_;
258 260
259 std::unique_ptr<ChromotingClient> client_; 261 std::unique_ptr<ChromotingClient> client_;
260 262
(...skipping 29 matching lines...) Expand all
290 292
291 // Weak reference to this instance, used for global logging and task posting. 293 // Weak reference to this instance, used for global logging and task posting.
292 base::WeakPtrFactory<ChromotingInstance> weak_factory_; 294 base::WeakPtrFactory<ChromotingInstance> weak_factory_;
293 295
294 DISALLOW_COPY_AND_ASSIGN(ChromotingInstance); 296 DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
295 }; 297 };
296 298
297 } // namespace remoting 299 } // namespace remoting
298 300
299 #endif // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ 301 #endif // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
OLDNEW
« no previous file with comments | « remoting/client/jni/chromoting_jni_runtime.cc ('k') | remoting/client/plugin/chromoting_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698