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

Unified Diff: remoting/host/chromoting_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/client/plugin/chromoting_scriptable_object.cc ('k') | remoting/host/host_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index fe9c5a4bad2e691cf49a2c60bb391464ac2a5db4..7aff37bd6a39e83292aa05eb5e744202b90af421 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -95,8 +95,10 @@ void ChromotingHost::Start(Task* shutdown_task) {
std::string xmpp_login;
std::string xmpp_auth_token;
+ std::string xmpp_auth_service;
if (!config_->GetString(kXmppLoginConfigPath, &xmpp_login) ||
- !config_->GetString(kXmppAuthTokenConfigPath, &xmpp_auth_token)) {
+ !config_->GetString(kXmppAuthTokenConfigPath, &xmpp_auth_token) ||
+ !config_->GetString(kXmppAuthServiceConfigPath, &xmpp_auth_service)) {
LOG(ERROR) << "XMPP credentials are not defined in the config.";
return;
}
@@ -105,7 +107,7 @@ void ChromotingHost::Start(Task* shutdown_task) {
signal_strategy_.reset(
new XmppSignalStrategy(context_->jingle_thread(), xmpp_login,
xmpp_auth_token,
- kChromotingTokenServiceName));
+ xmpp_auth_service));
jingle_client_ = new JingleClient(context_->jingle_thread(),
signal_strategy_.get(),
NULL, NULL, NULL, this);
« no previous file with comments | « remoting/client/plugin/chromoting_scriptable_object.cc ('k') | remoting/host/host_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698