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

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

Issue 12179013: Revert 180433 because build\some.gyp was added to the CL by mistake. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
===================================================================
--- remoting/host/win/elevated_controller_module.cc (revision 180437)
+++ remoting/host/win/elevated_controller_module.cc (working copy)
@@ -2,8 +2,6 @@
// 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>
@@ -13,6 +11,8 @@
#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,10 +23,15 @@
DECLARE_LIBID(LIBID_ChromotingElevatedControllerLib)
};
-int ElevatedControllerMain() {
+} // namespace remoting
+
+
+remoting::ElevatedControllerModule _AtlModule;
+
+int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int command) {
#ifdef OFFICIAL_BUILD
- if (IsUsageStatsAllowed()) {
- InitializeCrashReporting();
+ if (remoting::IsUsageStatsAllowed()) {
+ remoting::InitializeCrashReporting();
}
#endif // OFFICIAL_BUILD
@@ -42,10 +47,7 @@
// FilePath, LazyInstance, MessageLoop).
base::AtExitManager exit_manager;
- InitHostLogging();
+ remoting::InitHostLogging();
- ElevatedControllerModule module;
- return module.WinMain(SW_HIDE);
+ return _AtlModule.WinMain(command);
}
-
-} // 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