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

Unified Diff: remoting/host/client_session.h

Issue 2254673002: Remove dependency on AudioStub in ConnectionToClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/client_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_session.h
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
index ffcfa5ca91d218508322a82c06fa45a9e560844f..fe1b2def5eb5163a4ab6dc3ee26bb8a7be90ac3f 100644
--- a/remoting/host/client_session.h
+++ b/remoting/host/client_session.h
@@ -39,7 +39,7 @@ class SingleThreadTaskRunner;
namespace remoting {
-class AudioPump;
+class AudioStream;
class DesktopEnvironment;
class DesktopEnvironmentFactory;
class InputInjector;
@@ -93,7 +93,6 @@ class ClientSession : public base::NonThreadSafe,
// |event_handler| and |desktop_environment_factory| must outlive |this|.
// All |HostExtension|s in |extensions| must outlive |this|.
ClientSession(EventHandler* event_handler,
- scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
std::unique_ptr<protocol::ConnectionToClient> connection,
DesktopEnvironmentFactory* desktop_environment_factory,
const base::TimeDelta& max_duration,
@@ -119,7 +118,7 @@ class ClientSession : public base::NonThreadSafe,
protocol::ConnectionToClient* connection) override;
void OnConnectionAuthenticated(
protocol::ConnectionToClient* connection) override;
- void CreateVideoStreams(protocol::ConnectionToClient* connection) override;
+ void CreateMediaStreams(protocol::ConnectionToClient* connection) override;
void OnConnectionChannelsConnected(
protocol::ConnectionToClient* connection) override;
void OnConnectionClosed(protocol::ConnectionToClient* connection,
@@ -207,11 +206,9 @@ class ClientSession : public base::NonThreadSafe,
// is reached.
base::OneShotTimer max_duration_timer_;
- scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
-
// Objects responsible for sending video, audio and mouse shape.
- std::unique_ptr<AudioPump> audio_pump_;
std::unique_ptr<protocol::VideoStream> video_stream_;
+ std::unique_ptr<protocol::AudioStream> audio_stream_;
std::unique_ptr<MouseShapePump> mouse_shape_pump_;
// The set of all capabilities supported by the client.
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698