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

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

Issue 4275001: [Sync] Removed more uses of libjingle's sigslot (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 2 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
Index: jingle/notifier/listener/mediator_thread_impl.h
diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h
index 32a49e8580bcd784627a6fe73bc27ab81b213785..17efcad06113e4ab5e9a49526da20eb9ccd6c9b2 100644
--- a/jingle/notifier/listener/mediator_thread_impl.h
+++ b/jingle/notifier/listener/mediator_thread_impl.h
@@ -28,16 +28,16 @@
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "base/thread.h"
+#include "base/weak_ptr.h"
#include "jingle/notifier/base/notifier_options.h"
#include "jingle/notifier/communicator/login.h"
#include "jingle/notifier/listener/mediator_thread.h"
#include "talk/base/sigslot.h"
-#include "talk/xmpp/xmppclientsettings.h"
class MessageLoop;
namespace buzz {
-class XmppClient;
+class XmppClientSettings;
} // namespace buzz
namespace net {
@@ -45,19 +45,9 @@ class HostResolver;
} // namespace net
namespace notifier {
-class TaskPump;
-} // namespace notifier
-
-namespace talk_base {
-class SocketServer;
-class Thread;
-} // namespace talk_base
-
-namespace notifier {
-class MediatorThreadImpl
- : public MediatorThread,
- public sigslot::has_slots<> {
+class MediatorThreadImpl : public MediatorThread, public Login::Delegate,
+ public sigslot::has_slots<> {
public:
explicit MediatorThreadImpl(const NotifierOptions& notifier_options);
virtual ~MediatorThreadImpl();
@@ -77,19 +67,20 @@ class MediatorThreadImpl
const std::vector<std::string>& subscribed_services_list);
virtual void SendNotification(const OutgoingNotificationData& data);
+ // Login::Delegate implementation.
+ virtual void OnConnect(base::WeakPtr<talk_base::Task> base_task);
+ virtual void OnDisconnect();
+
protected:
// Should only be called after Start().
MessageLoop* worker_message_loop();
- virtual void OnDisconnect();
-
// These handle messages indicating an event happened in the outside
// world. These are all called from the worker thread. They are protected
// so they can be used by subclasses.
void OnIncomingNotification(
const IncomingNotificationData& notification_data);
void OnOutgoingNotification(bool success);
- void OnConnect(base::WeakPtr<talk_base::Task> parent);
void OnSubscriptionStateChange(bool success);
scoped_refptr<ObserverListThreadSafe<Observer> > observers_;
« no previous file with comments | « jingle/notifier/communicator/single_login_attempt.cc ('k') | jingle/notifier/listener/mediator_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698