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

Unified Diff: remoting/protocol/connection_to_host.h

Issue 8587053: Remove event_channel() and control_channel() from Session interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 1 month 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/protocol/connection_to_client_unittest.cc ('k') | remoting/protocol/connection_to_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/connection_to_host.h
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index 8a2385ae44f2211a00bc84e912c69090248095c9..c590da4dbcaf7f0d8c5c1d58c2c21cf15a331c71 100644
--- a/remoting/protocol/connection_to_host.h
+++ b/remoting/protocol/connection_to_host.h
@@ -117,8 +117,8 @@ class ConnectionToHost : public SignalStrategy::StatusObserver,
// Callback for |session_|.
void OnSessionStateChange(Session::State state);
- // Callback for VideoReader::Init().
- void OnVideoChannelInitialized(bool successful);
+ // Callbacks for channel initialization
+ void OnChannelInitialized(bool successful);
void NotifyIfChannelsReady();
@@ -153,17 +153,12 @@ class ConnectionToHost : public SignalStrategy::StatusObserver,
scoped_ptr<VideoReader> video_reader_;
scoped_ptr<ClientControlDispatcher> control_dispatcher_;
- scoped_ptr<ClientEventDispatcher> input_dispatcher_;
+ scoped_ptr<ClientEventDispatcher> event_dispatcher_;
// Internal state of the connection.
State state_;
Error error_;
- // State of the channels.
- bool control_connected_;
- bool input_connected_;
- bool video_connected_;
-
private:
DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
};
« no previous file with comments | « remoting/protocol/connection_to_client_unittest.cc ('k') | remoting/protocol/connection_to_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698