diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 02:11:48 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 02:11:48 +0000 |
| commit | fc43868654630100e0f5dd7beef20464ea434679 (patch) | |
| tree | c3cb020b3b42959736480e33ef7c0c6ee050ccee /jingle/notifier/base | |
| parent | 4593aa2be388ee1e028399d43e4e3f4d4491b5a2 (diff) | |
| download | chromium_src-fc43868654630100e0f5dd7beef20464ea434679.zip chromium_src-fc43868654630100e0f5dd7beef20464ea434679.tar.gz chromium_src-fc43868654630100e0f5dd7beef20464ea434679.tar.bz2 | |
[Sync] Replace TalkMediator*/MediatorThread* with PushClient
Streamline methods of PushClient and its Observer subclass.
Remove sync/protocol/service_constants.h and consolidate use of each
constant in one place. Remove duplicate constant in cloud print code.
BUG=76764
TEST=
TBR=estade@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10398051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier/base')
| -rw-r--r-- | jingle/notifier/base/notifier_options_util.cc | 5 | ||||
| -rw-r--r-- | jingle/notifier/base/notifier_options_util.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/jingle/notifier/base/notifier_options_util.cc b/jingle/notifier/base/notifier_options_util.cc index 9e107bc..67620a0 100644 --- a/jingle/notifier/base/notifier_options_util.cc +++ b/jingle/notifier/base/notifier_options_util.cc @@ -13,8 +13,7 @@ namespace notifier { buzz::XmppClientSettings MakeXmppClientSettings( const NotifierOptions& notifier_options, - const std::string& email, const std::string& token, - const std::string& token_service) { + const std::string& email, const std::string& token) { buzz::Jid jid = buzz::Jid(email); DCHECK(!jid.node().empty()); DCHECK(jid.IsValid()); @@ -27,7 +26,7 @@ buzz::XmppClientSettings MakeXmppClientSettings( xmpp_client_settings.set_auth_cookie( notifier_options.invalidate_xmpp_login ? token + "bogus" : token); - xmpp_client_settings.set_token_service(token_service); + xmpp_client_settings.set_token_service("chromiumsync"); if (notifier_options.allow_insecure_connection) { xmpp_client_settings.set_allow_plain(true); xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED); diff --git a/jingle/notifier/base/notifier_options_util.h b/jingle/notifier/base/notifier_options_util.h index 4278329..6ba2471 100644 --- a/jingle/notifier/base/notifier_options_util.h +++ b/jingle/notifier/base/notifier_options_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. // @@ -19,8 +19,7 @@ struct NotifierOptions; buzz::XmppClientSettings MakeXmppClientSettings( const NotifierOptions& notifier_options, - const std::string& email, const std::string& token, - const std::string& token_service); + const std::string& email, const std::string& token); ServerList GetServerList(const NotifierOptions& notifier_options); |