summaryrefslogtreecommitdiffstats
path: root/remoting/host/plugin/host_script_object.cc
diff options
context:
space:
mode:
authordharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-29 22:26:52 +0000
committerdharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-29 22:26:52 +0000
commitd23658e6f41f23bd690bc0fcc64668437d6e630d (patch)
treee22d4f25a1962026cd5dbbb0f6406a2cb0ebde64 /remoting/host/plugin/host_script_object.cc
parent2b55681176f0819aae9752633a878bf94b30ece9 (diff)
downloadchromium_src-d23658e6f41f23bd690bc0fcc64668437d6e630d.zip
chromium_src-d23658e6f41f23bd690bc0fcc64668437d6e630d.tar.gz
chromium_src-d23658e6f41f23bd690bc0fcc64668437d6e630d.tar.bz2
Revert 159402 - Move DaemonController to remoting/host/setup
DaemonController will be used outside of the plugin, so it doesn't make sense to keep it in the plugin directory. Official windows builder got busted. Review URL: https://chromiumcodereview.appspot.com/10985086 TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/11018005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/plugin/host_script_object.cc')
-rw-r--r--remoting/host/plugin/host_script_object.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 6af792f..15b5cee 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -27,6 +27,7 @@
#include "remoting/host/it2me_host_user_interface.h"
#include "remoting/host/network_settings.h"
#include "remoting/host/pin_hash.h"
+#include "remoting/host/plugin/daemon_controller.h"
#include "remoting/host/plugin/host_log_handler.h"
#include "remoting/host/policy_hack/policy_watcher.h"
#include "remoting/host/register_support_host_request.h"