summaryrefslogtreecommitdiffstats
path: root/remoting/host/heartbeat_sender.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-24 21:46:31 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-24 21:46:31 +0000
commitf07c7a111ecd0423bc4878e86364bb82cda07e67 (patch)
tree24102abf3d64f07c405c6c82315d78cae0ff5f2a /remoting/host/heartbeat_sender.cc
parente1324f25756a4fa4acc1ffd2bf99ee35796b83b5 (diff)
downloadchromium_src-f07c7a111ecd0423bc4878e86364bb82cda07e67.zip
chromium_src-f07c7a111ecd0423bc4878e86364bb82cda07e67.tar.gz
chromium_src-f07c7a111ecd0423bc4878e86364bb82cda07e67.tar.bz2
Revert 158366 - Cleanups in Chromoting Host.
1. Removed constants.[h|cc] 2. Removed platform if-defs in remoting_me2me_host.cc where they are not necessary. Review URL: https://codereview.chromium.org/10913260 TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/10988004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/heartbeat_sender.cc')
-rw-r--r--remoting/host/heartbeat_sender.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc
index 167b5e1..ee63ffd5 100644
--- a/remoting/host/heartbeat_sender.cc
+++ b/remoting/host/heartbeat_sender.cc
@@ -13,6 +13,7 @@
#include "base/string_number_conversions.h"
#include "base/time.h"
#include "remoting/base/constants.h"
+#include "remoting/host/constants.h"
#include "remoting/host/server_log_entry.h"
#include "remoting/jingle_glue/iq_sender.h"
#include "remoting/jingle_glue/signal_strategy.h"