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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 320403002: Pull out common code from client and host versions of LogToServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix try failures Created 6 years, 6 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/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index ed6f9f12e9e45bdad90411d9d72f4a0008543528..cde2684a86c5be003ad21b0f60d3165e091040a1 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -53,12 +53,12 @@
#include "remoting/host/host_event_logger.h"
#include "remoting/host/host_exit_codes.h"
#include "remoting/host/host_main.h"
+#include "remoting/host/host_status_logger.h"
#include "remoting/host/host_status_sender.h"
#include "remoting/host/ipc_constants.h"
#include "remoting/host/ipc_desktop_environment.h"
#include "remoting/host/ipc_host_event_logger.h"
#include "remoting/host/json_host_config.h"
-#include "remoting/host/log_to_server.h"
#include "remoting/host/logging.h"
#include "remoting/host/me2me_desktop_environment.h"
#include "remoting/host/pairing_registry_delegate.h"
@@ -308,7 +308,7 @@ class HostProcess
scoped_ptr<HeartbeatSender> heartbeat_sender_;
scoped_ptr<HostStatusSender> host_status_sender_;
scoped_ptr<HostChangeNotificationListener> host_change_notification_listener_;
- scoped_ptr<LogToServer> log_to_server_;
+ scoped_ptr<HostStatusLogger> host_status_logger_;
scoped_ptr<HostEventLogger> host_event_logger_;
scoped_ptr<ChromotingHost> host_;
@@ -1220,9 +1220,9 @@ void HostProcess::StartHost() {
host_change_notification_listener_.reset(new HostChangeNotificationListener(
this, host_id_, signal_strategy_.get(), directory_bot_jid_));
- log_to_server_.reset(
- new LogToServer(host_->AsWeakPtr(), ServerLogEntry::ME2ME,
- signal_strategy_.get(), directory_bot_jid_));
+ host_status_logger_.reset(
+ new HostStatusLogger(host_->AsWeakPtr(), ServerLogEntry::ME2ME,
+ signal_strategy_.get(), directory_bot_jid_));
// Set up repoting the host status notifications.
#if defined(REMOTING_MULTI_PROCESS)
@@ -1294,7 +1294,7 @@ void HostProcess::ShutdownOnNetworkThread() {
host_.reset();
host_event_logger_.reset();
- log_to_server_.reset();
+ host_status_logger_.reset();
heartbeat_sender_.reset();
host_status_sender_.reset();
host_change_notification_listener_.reset();

Powered by Google App Engine
This is Rietveld 408576698