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

Unified Diff: mojo/services/window_manager/main.cc

Issue 441853002: mojo: first take on removing mojo_main_{chromium,standalone}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: seperate Run call Created 6 years, 4 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
« mojo/services/network/main.cc ('K') | « mojo/services/view_manager/main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/window_manager/main.cc
diff --git a/mojo/services/window_manager/main.cc b/mojo/services/window_manager/main.cc
index 6d8c019a48024baa90ef9237a3ec05472312408a..d5a3ccf0360e759be3ffaac77433f58bc2963f89 100644
--- a/mojo/services/window_manager/main.cc
+++ b/mojo/services/window_manager/main.cc
@@ -4,6 +4,8 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_export.h"
+#include "mojo/public/cpp/application/application_runner_chromium.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/public/cpp/view_manager/view_manager.h"
#include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
@@ -69,9 +71,10 @@ class DefaultWindowManager : public ApplicationDelegate,
MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager);
};
-// static
-ApplicationDelegate* ApplicationDelegate::Create() {
- return new DefaultWindowManager;
-}
-
} // namespace mojo
+
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
+ MojoHandle shell_handle) {
+ mojo::ApplicationRunnerChromium runner(new mojo::DefaultWindowManager);
+ return runner.Run(shell_handle);
+}
« mojo/services/network/main.cc ('K') | « mojo/services/view_manager/main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698