| Index: mojo/examples/keyboard/keyboard.cc
|
| diff --git a/mojo/examples/keyboard/keyboard.cc b/mojo/examples/keyboard/keyboard.cc
|
| index 53a7204d846079c95ab8ee4fa8bb16784f1c1a97..57e034069c4037a97cb006e7c2f6c90f6add8c47 100644
|
| --- a/mojo/examples/keyboard/keyboard.cc
|
| +++ b/mojo/examples/keyboard/keyboard.cc
|
| @@ -10,6 +10,8 @@
|
| #include "mojo/examples/keyboard/keyboard_view.h"
|
| #include "mojo/public/cpp/application/application_connection.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/interface_factory_impl.h"
|
| #include "mojo/services/public/cpp/view_manager/node.h"
|
| #include "mojo/services/public/cpp/view_manager/view.h"
|
| @@ -137,10 +139,11 @@ void KeyboardServiceImpl::SetTarget(uint32_t node_id) {
|
| }
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::Keyboard;
|
| +extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
|
| + MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium app;
|
| + app.take_delegate(make_scoped_delegate(new mojo::examples::Keyboard));
|
| + return app.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|