summaryrefslogtreecommitdiffstats
path: root/jingle/notifier
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 /jingle/notifier
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 'jingle/notifier')
-rw-r--r--jingle/notifier/base/gaia_constants.cc12
-rw-r--r--jingle/notifier/base/gaia_constants.h14
-rw-r--r--jingle/notifier/base/gaia_token_pre_xmpp_auth.cc3
-rw-r--r--jingle/notifier/base/gaia_token_pre_xmpp_auth.h2
-rw-r--r--jingle/notifier/base/notifier_options.cc4
5 files changed, 28 insertions, 7 deletions
diff --git a/jingle/notifier/base/gaia_constants.cc b/jingle/notifier/base/gaia_constants.cc
new file mode 100644
index 0000000..f726843
--- /dev/null
+++ b/jingle/notifier/base/gaia_constants.cc
@@ -0,0 +1,12 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "jingle/notifier/base/gaia_constants.h"
+
+namespace notifier {
+
+// By default use a Google cookie auth mechanism.
+const char kDefaultGaiaAuthMechanism[] = "X-GOOGLE-TOKEN";
+
+} // namespace notifier
diff --git a/jingle/notifier/base/gaia_constants.h b/jingle/notifier/base/gaia_constants.h
new file mode 100644
index 0000000..fe2c993
--- /dev/null
+++ b/jingle/notifier/base/gaia_constants.h
@@ -0,0 +1,14 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef JINGLE_NOTIFIER_BASE_GAIA_CONSTANTS_H_
+#define JINGLE_NOTIFIER_BASE_GAIA_CONSTANTS_H_
+
+namespace notifier {
+
+extern const char kDefaultGaiaAuthMechanism[];
+
+} // namespace notifier
+
+#endif // JINGLE_NOTIFIER_BASE_GAIA_CONSTANTS_H_
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
index 36e1688..311371a 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
@@ -48,9 +48,6 @@ class GaiaCookieMechanism : public buzz::SaslCookieMechanism {
} // namespace
-// By default use a Google cookie auth mechanism.
-const char GaiaTokenPreXmppAuth::kDefaultAuthMechanism[] = "X-GOOGLE-TOKEN";
-
GaiaTokenPreXmppAuth::GaiaTokenPreXmppAuth(
const std::string& username,
const std::string& token,
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
index 6abf3a6..60e0c96 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
@@ -55,8 +55,6 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
virtual buzz::SaslMechanism* CreateSaslMechanism(
const std::string& mechanism) OVERRIDE;
- static const char kDefaultAuthMechanism[];
-
private:
std::string username_;
std::string token_;
diff --git a/jingle/notifier/base/notifier_options.cc b/jingle/notifier/base/notifier_options.cc
index dbb1d4c..3cf02ed 100644
--- a/jingle/notifier/base/notifier_options.cc
+++ b/jingle/notifier/base/notifier_options.cc
@@ -4,7 +4,7 @@
#include "jingle/notifier/base/notifier_options.h"
-#include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
+#include "jingle/notifier/base/gaia_constants.h"
namespace notifier {
@@ -13,7 +13,7 @@ NotifierOptions::NotifierOptions()
allow_insecure_connection(false),
invalidate_xmpp_login(false),
notification_method(kDefaultNotificationMethod),
- auth_mechanism(GaiaTokenPreXmppAuth::kDefaultAuthMechanism) {}
+ auth_mechanism(kDefaultGaiaAuthMechanism) {}
NotifierOptions::~NotifierOptions() { }