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

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: 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
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..f6e4ee9459930798b988d7b505decd10df9d1d34 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>
@@ -465,9 +466,13 @@ void HostProcess::CreateAuthenticatorFactory() {
}
scoped_ptr<protocol::AuthenticatorFactory> factory;
+ // TODO(jamiewalch): Add a proper pairing registry here once all the code
+ // is committed.
+ scoped_refptr<remoting::protocol::PairingRegistry> pairing_registry;
rmsousa 2013/05/15 01:25:16 Nit: Please either pass NULL explicitly (and move
Jamie 2013/05/15 23:41:08 It says quite clearly that it's not implemented. W
rmsousa 2013/05/16 00:46:25 I see, I agree passing NULL is the right move in t
Jamie 2013/05/16 19:30:16 The reason I made it separate is that the pairing
rmsousa 2013/05/16 20:11:02 I see what you mean, good point.
+
if (token_url_.is_empty() && token_validation_url_.is_empty()) {
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(

Powered by Google App Engine
This is Rietveld 408576698