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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 10825410: Update linux host to handle SIGHUP. use it to reload config. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « remoting/host/posix/sighup_listener.cc ('k') | remoting/host/sighup_listener_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 701ce32be5e7347918ff560a4824acf9ee4dacfc..53c14b356a15a20c8e0dbf7827c12a8dd7de9ca7 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -49,19 +49,24 @@
#include "remoting/jingle_glue/xmpp_signal_strategy.h"
#include "remoting/protocol/me2me_host_authenticator_factory.h"
+#if defined(OS_POSIX)
+#include "remoting/host/posix/sighup_listener.h"
+#endif // defined(OS_POSIX)
+
#if defined(OS_MACOSX)
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "remoting/host/curtain_mode_mac.h"
-#include "remoting/host/sighup_listener_mac.h"
-#endif
+#endif // defined(OS_MACOSX)
+
// N.B. OS_WIN is defined by including src/base headers.
#if defined(OS_WIN)
#include <commctrl.h>
-#endif
+#endif // defined(OS_WIN)
+
#if defined(TOOLKIT_GTK)
#include "ui/gfx/gtk_util.h"
-#endif
+#endif // defined(TOOLKIT_GTK)
namespace {
@@ -188,7 +193,7 @@ class HostProcess
#endif // defined(OS_WIN)
void ListenForConfigChanges() {
-#if defined(OS_MACOSX)
+#if defined(OS_POSIX)
remoting::RegisterHupSignalHandler(
base::Bind(&HostProcess::ConfigUpdatedDelayed, base::Unretained(this)));
#elif defined(OS_WIN)
@@ -200,7 +205,7 @@ class HostProcess
if (!config_watcher_->Watch(host_config_path_, delegate)) {
LOG(ERROR) << "Couldn't watch file " << host_config_path_.value();
}
-#endif
+#endif // defined (OS_WIN)
}
void CreateAuthenticatorFactory() {
« no previous file with comments | « remoting/host/posix/sighup_listener.cc ('k') | remoting/host/sighup_listener_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698