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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 15709005: Linux pairing registry delegate implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use JS time for serialization. Created 7 years, 6 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 252390ab7f997413a65a0df8fde59a859ae06232..8775bfc776c4c7a6c57376916ca20fece146e4d4 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -58,6 +58,7 @@
#include "remoting/host/logging.h"
#include "remoting/host/me2me_desktop_environment.h"
#include "remoting/host/network_settings.h"
+#include "remoting/host/pairing_registry_delegate.h"
#include "remoting/host/policy_hack/policy_watcher.h"
#include "remoting/host/service_urls.h"
#include "remoting/host/session_manager_factory.h"
@@ -478,12 +479,9 @@ void HostProcess::CreateAuthenticatorFactory() {
// TODO(jamiewalch): Add a pairing registry here once all the code
// is committed.
- scoped_refptr<remoting::protocol::PairingRegistry> pairing_registry;
- //scoped_refptr<protocol::PairingRegistry> pairing_registry(
- // new protocol::PairingRegistry(
- // scoped_ptr<protocol::PairingRegistry::Delegate>(
- // new protocol::NotImplementedPairingRegistryDelegate),
- // protocol::PairingRegistry::PairedClients()));
+ scoped_refptr<remoting::protocol::PairingRegistry> pairing_registry(
+ new remoting::protocol::PairingRegistry(
+ CreatePairingRegistryDelegate(NULL)));
scoped_ptr<protocol::AuthenticatorFactory> factory;

Powered by Google App Engine
This is Rietveld 408576698