summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue
diff options
context:
space:
mode:
authorqsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 09:59:02 +0000
committerqsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 09:59:02 +0000
commitc0144af95608992537fb36aa1ec57ec34cd3c4d7 (patch)
tree77833a86a98f318c3493c9ec4f707b56b1488d86 /remoting/jingle_glue
parentf503f2ea4305832504c1b14fcda98dd26c5ac0ef (diff)
downloadchromium_src-c0144af95608992537fb36aa1ec57ec34cd3c4d7.zip
chromium_src-c0144af95608992537fb36aa1ec57ec34cd3c4d7.tar.gz
chromium_src-c0144af95608992537fb36aa1ec57ec34cd3c4d7.tar.bz2
Create stub jingle library for iOS.
iOS doesn't use libjingle, but needs a stub jingle library for sync to compile. BUG=143886 R=akalin@chromium.org Review URL: https://chromiumcodereview.appspot.com/10829424 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
-rw-r--r--remoting/jingle_glue/xmpp_signal_strategy.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/jingle_glue/xmpp_signal_strategy.cc
index c31d323..9a04f7b 100644
--- a/remoting/jingle_glue/xmpp_signal_strategy.cc
+++ b/remoting/jingle_glue/xmpp_signal_strategy.cc
@@ -13,6 +13,7 @@
#include "jingle/glue/chrome_async_socket.h"
#include "jingle/glue/task_pump.h"
#include "jingle/glue/xmpp_client_socket_factory.h"
+#include "jingle/notifier/base/gaia_constants.h"
#include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
#include "net/socket/client_socket_factory.h"
#include "net/url_request/url_request_context_getter.h"
@@ -239,7 +240,7 @@ void XmppSignalStrategy::SendKeepAlive() {
buzz::PreXmppAuth* XmppSignalStrategy::CreatePreXmppAuth(
const buzz::XmppClientSettings& settings) {
buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY);
- std::string mechanism = notifier::GaiaTokenPreXmppAuth::kDefaultAuthMechanism;
+ std::string mechanism = notifier::kDefaultGaiaAuthMechanism;
if (settings.token_service() == "oauth2") {
mechanism = "X-OAUTH2";
}