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

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

Issue 12088049: Merged all Chromoting Host code into remoting_core.dll (Windows). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased 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
« no previous file with comments | « remoting/host/win/elevated_controller_module.h ('k') | remoting/host/win/elevated_controller_resource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/win/elevated_controller_module.cc
diff --git a/remoting/host/win/elevated_controller_module.cc b/remoting/host/win/elevated_controller_module.cc
index 620901c70a511034bdae7147aeff4710347be038..315da8faa20905da3ba483695524e1983c62d95e 100644
--- a/remoting/host/win/elevated_controller_module.cc
+++ b/remoting/host/win/elevated_controller_module.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "remoting/host/win/elevated_controller_module.h"
+
#include <atlbase.h>
#include <atlcom.h>
#include <atlctl.h>
@@ -11,8 +13,6 @@
#include "remoting/base/breakpad.h"
#include "remoting/host/logging.h"
#include "remoting/host/usage_stats_consent.h"
-
-// MIDL-generated declarations.
#include "remoting/host/win/elevated_controller.h"
namespace remoting {
@@ -23,15 +23,10 @@ class ElevatedControllerModule
DECLARE_LIBID(LIBID_ChromotingElevatedControllerLib)
};
-} // namespace remoting
-
-
-remoting::ElevatedControllerModule _AtlModule;
-
-int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int command) {
+int ElevatedControllerMain() {
#ifdef OFFICIAL_BUILD
- if (remoting::IsUsageStatsAllowed()) {
- remoting::InitializeCrashReporting();
+ if (IsUsageStatsAllowed()) {
+ InitializeCrashReporting();
}
#endif // OFFICIAL_BUILD
@@ -47,7 +42,10 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int command) {
// FilePath, LazyInstance, MessageLoop).
base::AtExitManager exit_manager;
- remoting::InitHostLogging();
+ InitHostLogging();
- return _AtlModule.WinMain(command);
+ ElevatedControllerModule module;
+ return module.WinMain(SW_HIDE);
}
+
+} // namespace remoting
« no previous file with comments | « remoting/host/win/elevated_controller_module.h ('k') | remoting/host/win/elevated_controller_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698