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

Unified Diff: remoting/protocol/connection_to_host.cc

Issue 7008003: Wire in OAuth2 support into non-sandboxed connections in libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyright + rebase Created 9 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/protocol/connection_to_host.h ('k') | remoting/protocol/protocol_test_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/connection_to_host.cc
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index f4a82f30cff2ea8f12f3bcc67264e3d93e2de50b..c86370ebb49613ea87b801fd7b8e0422da59c6de 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -55,6 +55,7 @@ MessageLoop* ConnectionToHost::message_loop() {
void ConnectionToHost::Connect(const std::string& username,
const std::string& auth_token,
+ const std::string& auth_service,
const std::string& host_jid,
const std::string& access_code,
HostEventCallback* event_callback,
@@ -67,8 +68,7 @@ void ConnectionToHost::Connect(const std::string& username,
// Initialize |jingle_client_|.
signal_strategy_.reset(
- new XmppSignalStrategy(thread_, username, auth_token,
- kChromotingTokenServiceName));
+ new XmppSignalStrategy(thread_, username, auth_token, auth_service));
jingle_client_ =
new JingleClient(thread_, signal_strategy_.get(),
network_manager_.release(), socket_factory_.release(),
« no previous file with comments | « remoting/protocol/connection_to_host.h ('k') | remoting/protocol/protocol_test_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698