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

Unified Diff: remoting/client/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/client/log_to_server.h
diff --git a/remoting/client/log_to_server.h b/remoting/client/log_to_server.h
index 35f3c96f048ded61e7ba5d8af6ff6d169fc27805..f9d3a9204c345b87174c15163cf1ed72d51a1a93 100644
--- a/remoting/client/log_to_server.h
+++ b/remoting/client/log_to_server.h
@@ -11,10 +11,10 @@
#include "base/threading/non_thread_safe.h"
#include "base/time/time.h"
-#include "remoting/client/server_log_entry.h"
#include "remoting/jingle_glue/signal_strategy.h"
#include "remoting/protocol/connection_to_host.h"
#include "remoting/protocol/errors.h"
+#include "remoting/protocol/server_log_entry.h"
namespace buzz {
class XmlElement;
@@ -37,7 +37,7 @@ namespace client {
class LogToServer : public base::NonThreadSafe,
public SignalStrategy::Listener {
public:
- LogToServer(ServerLogEntry::Mode mode,
+ LogToServer(protocol::ServerLogEntry::Mode mode,
SignalStrategy* signal_strategy,
const std::string& directory_bot_jid);
virtual ~LogToServer();
@@ -54,7 +54,7 @@ class LogToServer : public base::NonThreadSafe,
const buzz::XmlElement* stanza) OVERRIDE;
private:
- void Log(const ServerLogEntry& entry);
+ void Log(const protocol::ServerLogEntry& entry);
void SendPendingEntries();
// Generates a new random session ID.
@@ -63,12 +63,12 @@ class LogToServer : public base::NonThreadSafe,
// Expire the session ID if the maximum duration has been exceeded.
void MaybeExpireSessionId();
- ServerLogEntry::Mode mode_;
+ protocol::ServerLogEntry::Mode mode_;
SignalStrategy* signal_strategy_;
scoped_ptr<IqSender> iq_sender_;
std::string directory_bot_jid_;
- std::deque<ServerLogEntry> pending_entries_;
+ std::deque<protocol::ServerLogEntry> pending_entries_;
// A randomly generated session ID to be attached to log messages. This
// is regenerated at the start of a new session.

Powered by Google App Engine
This is Rietveld 408576698