sync/notifier/invalidation_notifier.cc - Issue 10398051: [Sync] Replace TalkMediator*/MediatorThread* with PushClient

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/notifier/invalidation_notifier.cc

Issue 10398051: [Sync] Replace TalkMediator*/MediatorThread* with PushClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments, fix test 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:

Index: sync/notifier/invalidation_notifier.cc

diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc

index ed16e1cf25d099073d0742878c503a646913659f..56ee668e487cd362d13261d85ce868f74d157e62 100644

--- a/sync/notifier/invalidation_notifier.cc

+++ b/sync/notifier/invalidation_notifier.cc

@@ -10,7 +10,6 @@

#include "jingle/notifier/base/notifier_options_util.h"

#include "net/url_request/url_request_context.h"

#include "sync/notifier/sync_notifier_observer.h"

-#include "sync/protocol/service_constants.h"

#include "sync/syncable/model_type_payload_map.h"

#include "talk/xmpp/jid.h"

#include "talk/xmpp/xmppclientsettings.h"

@@ -69,8 +68,7 @@ void InvalidationNotifier::UpdateCredentials(

CHECK(!invalidation_client_id_.empty());

DVLOG(1) << "Updating credentials for " << email;

buzz::XmppClientSettings xmpp_client_settings =

- notifier::MakeXmppClientSettings(notifier_options_,

- email, token, SYNC_SERVICE_NAME);

+ notifier::MakeXmppClientSettings(notifier_options_, email, token);

if (state_ >= CONNECTING) {

login_->UpdateXmppSettings(xmpp_client_settings);

} else {

« no previous file with comments | « sync/notifier/invalidation_notifier.h ('k') | sync/notifier/p2p_notifier.h » ('j') | no next file with comments »