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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: jingle/notifier/base/gaia_token_pre_xmpp_auth.h

Issue 10382003: Changes needed to roll libjingle r141 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 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
« jingle/notifier/base/chrome_async_socket.cc ('K') | « jingle/notifier/base/chrome_async_socket.cc ('k') | jingle/notifier/base/gaia_token_pre_xmpp_auth.cc » ('j') | jingle/notifier/base/notifier_options_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/notifier/base/gaia_token_pre_xmpp_auth.h
===================================================================
--- jingle/notifier/base/gaia_token_pre_xmpp_auth.h (revision 136430)
+++ jingle/notifier/base/gaia_token_pre_xmpp_auth.h (working copy)
@@ -30,7 +30,8 @@
virtual void StartPreXmppAuth(const buzz::Jid& jid,
const talk_base::SocketAddress& server,
const talk_base::CryptString& pass,
- const std::string& auth_cookie) OVERRIDE;
+ const std::string& auth_mechanism,
+ const std::string& auth_token) OVERRIDE;
virtual bool IsAuthDone() const OVERRIDE;
@@ -42,8 +43,10 @@
virtual buzz::CaptchaChallenge GetCaptchaChallenge() const OVERRIDE;
- virtual std::string GetAuthCookie() const OVERRIDE;
+ virtual std::string GetAuthToken() const OVERRIDE;
+ virtual std::string GetAuthMechanism() const OVERRIDE;
+
// buzz::SaslHandler implementation.
virtual std::string ChooseBestSaslMechanism(
« jingle/notifier/base/chrome_async_socket.cc ('K') | « jingle/notifier/base/chrome_async_socket.cc ('k') | jingle/notifier/base/gaia_token_pre_xmpp_auth.cc » ('j') | jingle/notifier/base/notifier_options_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698