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

Unified Diff: remoting/protocol/connection_to_client.cc

Issue 6724033: Remove authenticated_ fields from stubs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer's comments. Created 9 years, 9 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/protocol/connection_to_client.h ('k') | remoting/protocol/connection_to_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/connection_to_client.cc
diff --git a/remoting/protocol/connection_to_client.cc b/remoting/protocol/connection_to_client.cc
index 4ec9a0b4aa5606a2be099d39fc24cf14a5666d20..96c11e4eeddd4d9cefe79d6e011e8284ec56098e 100644
--- a/remoting/protocol/connection_to_client.cc
+++ b/remoting/protocol/connection_to_client.cc
@@ -22,13 +22,11 @@ namespace protocol {
static const size_t kAverageUpdateStream = 10;
ConnectionToClient::ConnectionToClient(MessageLoop* message_loop,
- EventHandler* handler,
- InputStub* input_stub)
- : client_authenticated_(false),
- loop_(message_loop),
+ EventHandler* handler)
+ : loop_(message_loop),
handler_(handler),
host_stub_(NULL),
- input_stub_(input_stub) {
+ input_stub_(NULL) {
DCHECK(loop_);
DCHECK(handler_);
}
@@ -75,14 +73,14 @@ ClientStub* ConnectionToClient::client_stub() {
return client_stub_.get();
}
-protocol::HostStub* ConnectionToClient::host_stub() {
- return host_stub_;
-}
-
void ConnectionToClient::set_host_stub(protocol::HostStub* host_stub) {
host_stub_ = host_stub;
}
+void ConnectionToClient::set_input_stub(protocol::InputStub* input_stub) {
+ input_stub_ = input_stub;
+}
+
void ConnectionToClient::OnSessionStateChange(protocol::Session::State state) {
if (state == protocol::Session::CONNECTED) {
client_stub_.reset(new ClientControlSender(session_->control_channel()));
@@ -128,32 +126,6 @@ void ConnectionToClient::StateChangeTask(protocol::Session::State state) {
// OnClosed() is used as a callback for protocol::Session::Close().
void ConnectionToClient::OnClosed() {
- client_authenticated_ = false;
-
- // TODO(lambroslambrou): Remove these when stubs are refactored not to
- // store authentication state.
- if (input_stub_)
- input_stub_->OnClosed();
- if (host_stub_)
- host_stub_->OnClosed();
- if (client_stub_.get())
- client_stub_->OnClosed();
-}
-
-void ConnectionToClient::OnClientAuthenticated() {
- client_authenticated_ = true;
-
- // Enable/disable each of the channels.
- if (input_stub_)
- input_stub_->OnAuthenticated();
- if (host_stub_)
- host_stub_->OnAuthenticated();
- if (client_stub_.get())
- client_stub_->OnAuthenticated();
-}
-
-bool ConnectionToClient::client_authenticated() {
- return client_authenticated_;
}
} // namespace protocol
« no previous file with comments | « remoting/protocol/connection_to_client.h ('k') | remoting/protocol/connection_to_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698