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

Unified Diff: remoting/host/win/host_service.cc

Issue 11970044: Merged all Chromoting Host code into remoting_core.dll (Windows). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: host_ui_resource.h has been deleted. Created 7 years, 11 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
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

Powered by Google App Engine
This is Rietveld 408576698