| Index: mojo/services/window_manager/main.cc
|
| diff --git a/mojo/services/window_manager/main.cc b/mojo/services/window_manager/main.cc
|
| index b77d3885a469c72bf7777220e8dec2654c8f3bd4..681c7eccb8404d9476e68f2ab9c7a70641a20178 100644
|
| --- a/mojo/services/window_manager/main.cc
|
| +++ b/mojo/services/window_manager/main.cc
|
| @@ -2,18 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#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/services/window_manager/window_manager_app.h"
|
|
|
| // ApplicationDelegate implementation file for WindowManager users (e.g.
|
| // core window manager tests) that do not want to provide their own
|
| // ApplicationDelegate::Create().
|
|
|
| -namespace mojo {
|
| -
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new WindowManagerApp(NULL);
|
| +extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
|
| + MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium app;
|
| + app.take_delegate(make_scoped_delegate(new mojo::WindowManagerApp(NULL)));
|
| + return app.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|