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

Unified Diff: remoting/host/log_to_server.h

Issue 12386035: Moving host status events monitoring to a separate interface (HostStatusMonitor). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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: remoting/host/log_to_server.h
diff --git a/remoting/host/log_to_server.h b/remoting/host/log_to_server.h
index e65adae006e28e9a53812deb602784c6542fd608..bbd920c44134ef08cab6b7d80977c0f0fbfcca69 100644
--- a/remoting/host/log_to_server.h
+++ b/remoting/host/log_to_server.h
@@ -9,8 +9,8 @@
#include <map>
#include <string>
-#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "remoting/host/host_status_observer.h"
#include "remoting/host/server_log_entry.h"
@@ -27,7 +27,7 @@ class XmlElement;
namespace remoting {
-class ChromotingHost;
+class HostStatusMonitor;
class IqSender;
// LogToServer sends log entries to a server.
@@ -37,7 +37,7 @@ class LogToServer : public base::NonThreadSafe,
public HostStatusObserver,
public SignalStrategy::Listener {
public:
- explicit LogToServer(ChromotingHost* host,
+ explicit LogToServer(base::WeakPtr<HostStatusMonitor> monitor,
ServerLogEntry::Mode mode,
SignalStrategy* signal_strategy,
const std::string& directory_bot_jid);
@@ -65,7 +65,7 @@ class LogToServer : public base::NonThreadSafe,
void Log(const ServerLogEntry& entry);
void SendPendingEntries();
- scoped_refptr<ChromotingHost> host_;
+ base::WeakPtr<HostStatusMonitor> monitor_;
ServerLogEntry::Mode mode_;
SignalStrategy* signal_strategy_;
scoped_ptr<IqSender> iq_sender_;

Powered by Google App Engine
This is Rietveld 408576698