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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: jingle/notifier/base/notifier_options_util.cc

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/gaia_token_pre_xmpp_auth.cc ('k') | jingle/notifier/base/xmpp_connection_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/notifier/base/notifier_options_util.cc
===================================================================
--- jingle/notifier/base/notifier_options_util.cc (revision 136430)
+++ jingle/notifier/base/notifier_options_util.cc (working copy)
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "jingle/notifier/base/const_communicator.h"
#include "jingle/notifier/base/notifier_options.h"
+#include "talk/xmpp/constants.h"
#include "talk/xmpp/jid.h"
namespace notifier {
@@ -24,7 +25,7 @@
xmpp_client_settings.set_resource("chrome-sync");
xmpp_client_settings.set_host(jid.domain());
xmpp_client_settings.set_use_tls(buzz::TLS_ENABLED);
- xmpp_client_settings.set_auth_cookie(
+ xmpp_client_settings.set_auth_token(buzz::AUTH_MECHANISM_GOOGLE_TOKEN,
akalin 2012/05/11 18:04:05 newline after (, indent four spaces
notifier_options.invalidate_xmpp_login ?
token + "bogus" : token);
xmpp_client_settings.set_token_service(token_service);
« jingle/notifier/base/chrome_async_socket.cc ('K') | « jingle/notifier/base/gaia_token_pre_xmpp_auth.cc ('k') | jingle/notifier/base/xmpp_connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698