| 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);
|
| +}
|
|
|