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

Unified Diff: remoting/client/chromoting_client.cc

Issue 10453080: Revert 139424 - Remove V1 authenticators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | remoting/client/client_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/chromoting_client.cc
===================================================================
--- remoting/client/chromoting_client.cc (revision 139575)
+++ remoting/client/chromoting_client.cc (working copy)
@@ -11,6 +11,7 @@
#include "remoting/protocol/authentication_method.h"
#include "remoting/protocol/connection_to_host.h"
#include "remoting/protocol/negotiating_authenticator.h"
+#include "remoting/protocol/v1_authenticator.h"
#include "remoting/protocol/session_config.h"
#include "remoting/protocol/transport.h"
@@ -52,9 +53,14 @@
DCHECK(message_loop()->BelongsToCurrentThread());
scoped_ptr<protocol::Authenticator> authenticator;
- authenticator = protocol::NegotiatingAuthenticator::CreateForClient(
- config_.authentication_tag,
- config_.shared_secret, config_.authentication_methods);
+ if (config_.use_v1_authenticator) {
+ authenticator.reset(new protocol::V1ClientAuthenticator(
+ config_.local_jid, config_.shared_secret));
+ } else {
+ authenticator = protocol::NegotiatingAuthenticator::CreateForClient(
+ config_.authentication_tag,
+ config_.shared_secret, config_.authentication_methods);
+ }
connection_->Connect(xmpp_proxy, config_.local_jid, config_.host_jid,
config_.host_public_key, transport_factory.Pass(),
« no previous file with comments | « no previous file | remoting/client/client_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698