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

Unified Diff: jingle/notifier/listener/talk_mediator_impl.h

Issue 6881042: [Sync] Fix race condition in P2PNotifier with sending notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 9 years, 8 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
« no previous file with comments | « jingle/notifier/listener/talk_mediator.h ('k') | jingle/notifier/listener/talk_mediator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/notifier/listener/talk_mediator_impl.h
diff --git a/jingle/notifier/listener/talk_mediator_impl.h b/jingle/notifier/listener/talk_mediator_impl.h
index d563ed02fb3cb42761815c67791445712537766c..718bb89df50ffc6eb07630f4ced7d5f7555d57d1 100644
--- a/jingle/notifier/listener/talk_mediator_impl.h
+++ b/jingle/notifier/listener/talk_mediator_impl.h
@@ -52,7 +52,7 @@ class TalkMediatorImpl
// Users must call Logout once Login is called.
virtual bool Logout();
- virtual bool SendNotification(const Notification& data);
+ virtual void SendNotification(const Notification& data);
virtual void AddSubscription(const Subscription& subscription);
@@ -69,8 +69,7 @@ class TalkMediatorImpl
private:
struct TalkMediatorState {
TalkMediatorState()
- : started(0), initialized(0), logging_in(0),
- logged_in(0), subscribed(0) {
+ : started(0), initialized(0), logging_in(0), logged_in(0) {
}
unsigned int started : 1; // Background thread has started.
@@ -78,7 +77,6 @@ class TalkMediatorImpl
unsigned int logging_in : 1; // Logging in to the mediator's
// authenticator.
unsigned int logged_in : 1; // Logged in the mediator's authenticator.
- unsigned int subscribed : 1; // Subscribed to the xmpp receiving channel.
};
void CheckOrSetValidThread();
« no previous file with comments | « jingle/notifier/listener/talk_mediator.h ('k') | jingle/notifier/listener/talk_mediator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698