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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 14793021: PairingAuthenticator implementation and plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed clang errors. Created 7 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 | « remoting/client/chromoting_client.cc ('k') | remoting/protocol/authentication_method.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 6ee42b9ff8d15d1e8cc16b47949b21f3d2e84cd5..8c2771c1fdf018ca37bc0c2cc5bce554491f5326 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -67,6 +67,7 @@
#include "remoting/host/usage_stats_consent.h"
#include "remoting/jingle_glue/xmpp_signal_strategy.h"
#include "remoting/protocol/me2me_host_authenticator_factory.h"
+#include "remoting/protocol/pairing_registry.h"
#if defined(OS_POSIX)
#include <signal.h>
@@ -466,8 +467,12 @@ void HostProcess::CreateAuthenticatorFactory() {
scoped_ptr<protocol::AuthenticatorFactory> factory;
if (token_url_.is_empty() && token_validation_url_.is_empty()) {
+ // TODO(jamiewalch): Add a pairing registry here once all the code
+ // is committed.
+ scoped_refptr<remoting::protocol::PairingRegistry> pairing_registry;
factory = protocol::Me2MeHostAuthenticatorFactory::CreateWithSharedSecret(
- local_certificate, key_pair_, host_secret_hash_);
+ local_certificate, key_pair_, host_secret_hash_, pairing_registry);
+
} else if (token_url_.is_valid() && token_validation_url_.is_valid()) {
scoped_ptr<protocol::ThirdPartyHostAuthenticator::TokenValidatorFactory>
token_validator_factory(new TokenValidatorFactoryImpl(
@@ -475,6 +480,7 @@ void HostProcess::CreateAuthenticatorFactory() {
context_->url_request_context_getter()));
factory = protocol::Me2MeHostAuthenticatorFactory::CreateWithThirdPartyAuth(
local_certificate, key_pair_, token_validator_factory.Pass());
+
} else {
// TODO(rmsousa): If the policy is bad the host should not go online. It
// should keep running, but not connected, until the policies are fixed.
« no previous file with comments | « remoting/client/chromoting_client.cc ('k') | remoting/protocol/authentication_method.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698