summaryrefslogtreecommitdiffstats
path: root/remoting/host/heartbeat_sender.cc
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 22:57:51 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 22:57:51 +0000
commit4629847047bb05a24e9dc090f256f733f347dc1d (patch)
tree647966b3c693824ab90fad67186c8a34d6625a27 /remoting/host/heartbeat_sender.cc
parentdf59dd4238593e58b7d68928a43d0eaf8283c50d (diff)
downloadchromium_src-4629847047bb05a24e9dc090f256f733f347dc1d.zip
chromium_src-4629847047bb05a24e9dc090f256f733f347dc1d.tar.gz
chromium_src-4629847047bb05a24e9dc090f256f733f347dc1d.tar.bz2
Revert 156889 - Cleanups in Chromoting Host.
Google Chrome Win build break? http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/13082/steps/compile/logs/stdio#error1 (3:53:26 PM) msw_: 506>host\win\wts_session_process_launcher.cc(30): fatalerror C1083: Cannot open include file: 'remoting/host/constants.h': No such file or directory 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/10907246 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156916 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"