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

Unified Diff: remoting/host/host_main.cc

Issue 49113003: It2Me native messaging: GYP and source refactoring (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Max/Linux build break: remoting_native_messaging_host Created 7 years, 1 month 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 | « no previous file | remoting/host/it2me/it2me_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_main.cc
diff --git a/remoting/host/host_main.cc b/remoting/host/host_main.cc
index bf3dc17022fb234ddf21e4ce63e35f5d6eaad8b6..512bc645ebfbeecaa26ea589eaa838afe46b3f52 100644
--- a/remoting/host/host_main.cc
+++ b/remoting/host/host_main.cc
@@ -21,7 +21,7 @@
#include "remoting/base/resources.h"
#include "remoting/host/host_exit_codes.h"
#include "remoting/host/logging.h"
-#include "remoting/host/setup/native_messaging_host.h"
+#include "remoting/host/setup/me2me_native_messaging_host.h"
#include "remoting/host/usage_stats_consent.h"
#if defined(OS_MACOSX)
@@ -155,7 +155,10 @@ int RdpDesktopSessionMain() {
MainRoutineFn SelectMainRoutine(const std::string& process_type) {
MainRoutineFn main_routine = NULL;
- if (process_type == kProcessTypeDaemon) {
+ if (process_type == kProcessTypeHost) {
+ main_routine = &HostProcessMain;
+#if defined(OS_WIN)
+ } else if (process_type == kProcessTypeDaemon) {
main_routine = &DaemonProcessMain;
} else if (process_type == kProcessTypeDesktop) {
main_routine = &DesktopProcessMain;
@@ -163,10 +166,9 @@ MainRoutineFn SelectMainRoutine(const std::string& process_type) {
main_routine = &ElevatedControllerMain;
} else if (process_type == kProcessTypeRdpDesktopSession) {
main_routine = &RdpDesktopSessionMain;
- } else if (process_type == kProcessTypeHost) {
- main_routine = &HostProcessMain;
} else if (process_type == kProcessTypeNativeMessagingHost) {
main_routine = &NativeMessagingHostMain;
+#endif // defined(OS_WIN)
}
return main_routine;
« no previous file with comments | « no previous file | remoting/host/it2me/it2me_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698