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

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: Fixed Windows and Mac compile errors. 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 9df3657d4f56df61d9159a5b3b672353d15eac48..d684a8617283cf9c6651e3d91ced4e2c27199d0c 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -57,6 +57,7 @@
#include "remoting/host/log_to_server.h"
#include "remoting/host/logging.h"
#include "remoting/host/me2me_desktop_environment.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;
« no previous file with comments | « remoting/host/pairing_registry_delegate_win.cc ('k') | remoting/protocol/negotiating_authenticator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698