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

Unified Diff: remoting/protocol/client_control_dispatcher.cc

Issue 14715012: Protocol-level changes required to support PIN-less authentication. (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/protocol/client_control_dispatcher.cc
diff --git a/remoting/protocol/client_control_dispatcher.cc b/remoting/protocol/client_control_dispatcher.cc
index 580ea28a20ed126a4b7985e48a2decd6932da6d2..fee63dcfc1cc8ff3a2c3f1388e315914915f90e1 100644
--- a/remoting/protocol/client_control_dispatcher.cc
+++ b/remoting/protocol/client_control_dispatcher.cc
@@ -64,6 +64,16 @@ void ClientControlDispatcher::SetCapabilities(
const Capabilities& capabilities) {
ControlMessage message;
message.mutable_capabilities()->CopyFrom(capabilities);
+}
+
+void ClientControlDispatcher::RequestPairing(
+ const PairingRequest& pairing_request,
+ const base::Callback<void(const PairingReply&)>& callback) {
+ // TODO(jamiewalch): Add a request id to the pairing requests to allow us to
+ // route the response to the correct callback.
+ latest_pairing_callback_ = callback;
+ ControlMessage message;
+ message.mutable_pairing_request()->CopyFrom(pairing_request);
writer_.Write(SerializeAndFrameMessage(message), base::Closure());
}
@@ -79,6 +89,11 @@ void ClientControlDispatcher::OnMessageReceived(
client_stub_->SetCapabilities(message->capabilities());
} else if (message->has_cursor_shape()) {
client_stub_->SetCursorShape(message->cursor_shape());
+ } else if (message->has_pairing_reply()) {
+ if (!latest_pairing_callback_.is_null()) {
alexeypa (please no reviews) 2013/05/09 02:49:20 nit: LOG(WARNING) << some message if no callback a
Jamie 2013/05/09 17:59:52 No longer needed in light of your and Renato's com
+ latest_pairing_callback_.Run(message->pairing_reply());
+ latest_pairing_callback_.Reset();
alexeypa (please no reviews) 2013/05/09 02:49:20 I'd say this logic belongs to |client_stub|. Up un
rmsousa 2013/05/09 03:55:02 Agreed. ClientStub is already essentially a callba
Jamie 2013/05/09 17:59:52 Fair enough. It gets rid of a TODO and makes this
+ }
} else {
LOG(WARNING) << "Unknown control message received.";
}

Powered by Google App Engine
This is Rietveld 408576698