Chromium Code Reviews| Index: remoting/host/chromoting_host.cc |
| diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc |
| index 7d738d86a76e9f156f4c161662023ecaa13178a8..3adf7fa70bcacbce6638288c19bcd43b5508befd 100644 |
| --- a/remoting/host/chromoting_host.cc |
| +++ b/remoting/host/chromoting_host.cc |
| @@ -22,7 +22,6 @@ |
| #include "remoting/host/screen_recorder.h" |
| #include "remoting/host/user_authenticator.h" |
| #include "remoting/jingle_glue/xmpp_signal_strategy.h" |
| -#include "remoting/proto/auth.pb.h" |
| #include "remoting/protocol/connection_to_client.h" |
| #include "remoting/protocol/client_stub.h" |
| #include "remoting/protocol/host_stub.h" |
| @@ -304,7 +303,6 @@ void ChromotingHost::OnIncomingSession( |
| // Create a client object. |
| ClientSession* client = new ClientSession( |
| this, |
| - UserAuthenticator::Create(), |
| connection, |
| desktop_environment_->event_executor(), |
| desktop_environment_->capturer()); |
| @@ -446,7 +444,7 @@ void ChromotingHost::EnableCurtainMode(bool enable) { |
| is_curtained_ = enable; |
| } |
| -void ChromotingHost::LocalLoginSucceeded( |
| +void ChromotingHost::OnAuthorizationComplete( |
| scoped_refptr<ConnectionToClient> connection) { |
| DCHECK(context_->network_message_loop()->BelongsToCurrentThread()); |
| @@ -462,11 +460,6 @@ void ChromotingHost::AddAuthenticatedClient( |
| const std::string& jid) { |
| DCHECK_EQ(context_->main_message_loop(), MessageLoop::current()); |
| - protocol::LocalLoginStatus* status = new protocol::LocalLoginStatus(); |
| - status->set_success(true); |
| - connection->client_stub()->BeginSessionResponse( |
| - status, base::Bind(&DeletePointer<protocol::LocalLoginStatus>, status)); |
| - |
| // Disconnect all other clients. |
| // Iterate over a copy of the list of clients, to avoid mutating the list |
| // while iterating over it. |
| @@ -514,21 +507,6 @@ void ChromotingHost::AddAuthenticatedClient( |
| } |
| } |
| -void ChromotingHost::LocalLoginFailed( |
| - scoped_refptr<ConnectionToClient> connection) { |
| - if (MessageLoop::current() != context_->main_message_loop()) { |
| - context_->main_message_loop()->PostTask( |
| - FROM_HERE, base::Bind(&ChromotingHost::LocalLoginFailed, this, |
| - connection)); |
| - return; |
| - } |
| - |
| - protocol::LocalLoginStatus* status = new protocol::LocalLoginStatus(); |
| - status->set_success(false); |
| - connection->client_stub()->BeginSessionResponse( |
| - status, base::Bind(&DeletePointer<protocol::LocalLoginStatus>, status)); |
| -} |
| - |
| void ChromotingHost::ProcessPreAuthentication( |
| const scoped_refptr<ConnectionToClient>& connection) { |
| DCHECK_EQ(context_->main_message_loop(), MessageLoop::current()); |
| @@ -542,7 +520,7 @@ void ChromotingHost::ProcessPreAuthentication( |
| context_->network_message_loop()->PostTask( |
| FROM_HERE, base::Bind(&ClientSession::OnAuthorizationComplete, |
| - client->get(), true)); |
| + client->get())); |
|
Wez
2011/11/03 00:25:02
nit: It seems a little strange that we go through
Sergey Ulanov
2011/11/03 01:21:12
The original intent was to call authorization the
Wez
2011/11/03 18:14:37
Strictly speaking, we should probably talk about a
|
| } |
| void ChromotingHost::StopScreenRecorder() { |