Index: remoting/host/win/host_service.cc |
diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc |
index 84c7f7cfa45b8a69740e241264ba651e6cb0aa4f..3d228c9b172bdb35c424d2a9891304830e5bae62 100644 |
--- a/remoting/host/win/host_service.cc |
+++ b/remoting/host/win/host_service.cc |
@@ -37,7 +37,7 @@ |
#endif // defined(REMOTING_MULTI_PROCESS) |
#include "remoting/host/usage_stats_consent.h" |
-#include "remoting/host/win/host_service_resource.h" |
+#include "remoting/host/win/core_resource.h" |
#include "remoting/host/win/wts_console_observer.h" |
#if !defined(REMOTING_MULTI_PROCESS) |
@@ -456,15 +456,10 @@ LRESULT CALLBACK HostService::SessionChangeNotificationProc(HWND hwnd, |
} |
} |
-} // namespace remoting |
- |
-int CALLBACK WinMain(HINSTANCE instance, |
- HINSTANCE previous_instance, |
- LPSTR raw_command_line, |
- int show_command) { |
+int RunDaemonProcess() { |
#ifdef OFFICIAL_BUILD |
- if (remoting::IsUsageStatsAllowed()) { |
- remoting::InitializeCrashReporting(); |
+ if (IsUsageStatsAllowed()) { |
+ InitializeCrashReporting(); |
} |
#endif // OFFICIAL_BUILD |
@@ -476,20 +471,22 @@ int CALLBACK WinMain(HINSTANCE instance, |
// the command line from GetCommandLineW(), so we can safely pass NULL here. |
CommandLine::Init(0, NULL); |
- remoting::InitHostLogging(); |
+ InitHostLogging(); |
const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
if (command_line->HasSwitch(kHelpSwitchName) || |
command_line->HasSwitch(kQuestionSwitchName)) { |
usage(command_line->GetProgram()); |
- return remoting::kSuccessExitCode; |
+ return kSuccessExitCode; |
} |
- remoting::HostService* service = remoting::HostService::GetInstance(); |
+ HostService* service = HostService::GetInstance(); |
if (!service->InitWithCommandLine(command_line)) { |
usage(command_line->GetProgram()); |
- return remoting::kUsageExitCode; |
+ return kUsageExitCode; |
} |
return service->Run(); |
} |
+ |
+} // namespace remoting |