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

Unified Diff: remoting/host/log_to_server.h

Issue 282063005: Pull out common code from client and host versions of ServerLogEntry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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:
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 bbd920c44134ef08cab6b7d80977c0f0fbfcca69..f0ea6759607c922ee103b7eab5dbfb05e9543370 100644
--- a/remoting/host/log_to_server.h
+++ b/remoting/host/log_to_server.h
@@ -13,8 +13,8 @@
#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"
#include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/protocol/server_log_entry.h"
#include "remoting/protocol/transport.h"
namespace base {
@@ -38,7 +38,7 @@ class LogToServer : public base::NonThreadSafe,
public SignalStrategy::Listener {
public:
explicit LogToServer(base::WeakPtr<HostStatusMonitor> monitor,
- ServerLogEntry::Mode mode,
+ protocol::ServerLogEntry::Mode mode,
SignalStrategy* signal_strategy,
const std::string& directory_bot_jid);
virtual ~LogToServer();
@@ -62,11 +62,11 @@ class LogToServer : public base::NonThreadSafe,
const protocol::TransportRoute& route) OVERRIDE;
private:
- void Log(const ServerLogEntry& entry);
+ void Log(const protocol::ServerLogEntry& entry);
void SendPendingEntries();
base::WeakPtr<HostStatusMonitor> monitor_;
- ServerLogEntry::Mode mode_;
+ protocol::ServerLogEntry::Mode mode_;
SignalStrategy* signal_strategy_;
scoped_ptr<IqSender> iq_sender_;
std::string directory_bot_jid_;
@@ -75,7 +75,7 @@ class LogToServer : public base::NonThreadSafe,
// this host.
std::map<std::string, protocol::TransportRoute::RouteType>
connection_route_type_;
- std::deque<ServerLogEntry> pending_entries_;
+ std::deque<protocol::ServerLogEntry> pending_entries_;
DISALLOW_COPY_AND_ASSIGN(LogToServer);
};

Powered by Google App Engine
This is Rietveld 408576698