OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/bind.h" | 6 #include "base/bind.h" |
7 #include "mojo/public/cpp/application/application_delegate.h" | 7 #include "mojo/public/cpp/application/application_delegate.h" |
| 8 #include "mojo/public/cpp/application/application_export.h" |
8 #include "mojo/public/cpp/application/application_impl.h" | 9 #include "mojo/public/cpp/application/application_impl.h" |
| 10 #include "mojo/public/cpp/application/application_runner_chromium.h" |
9 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" | 11 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" |
10 | 12 |
11 namespace mojo { | 13 namespace mojo { |
12 namespace examples { | 14 namespace examples { |
13 | 15 |
14 // ViewManagerInit is responsible for establishing the initial connection to | 16 // ViewManagerInit is responsible for establishing the initial connection to |
15 // the view manager. When established it loads |mojo_aura_demo|. | 17 // the view manager. When established it loads |mojo_aura_demo|. |
16 class ViewManagerInit : public ApplicationDelegate { | 18 class ViewManagerInit : public ApplicationDelegate { |
17 public: | 19 public: |
18 ViewManagerInit() {} | 20 ViewManagerInit() {} |
(...skipping 11 matching lines...) Expand all Loading... |
30 DCHECK(result); | 32 DCHECK(result); |
31 VLOG(1) << "ViewManagerInit::DidConnection result=" << result; | 33 VLOG(1) << "ViewManagerInit::DidConnection result=" << result; |
32 } | 34 } |
33 | 35 |
34 ViewManagerInitServicePtr view_manager_init_; | 36 ViewManagerInitServicePtr view_manager_init_; |
35 | 37 |
36 DISALLOW_COPY_AND_ASSIGN(ViewManagerInit); | 38 DISALLOW_COPY_AND_ASSIGN(ViewManagerInit); |
37 }; | 39 }; |
38 | 40 |
39 } // namespace examples | 41 } // namespace examples |
| 42 } // namespace mojo |
40 | 43 |
41 // static | 44 extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
42 ApplicationDelegate* ApplicationDelegate::Create() { | 45 MojoHandle shell_handle) { |
43 return new examples::ViewManagerInit(); | 46 return mojo::ApplicationRunnerChromium(make_scoped_delegate( |
| 47 new mojo::examples::ViewManagerInit)).Run(shell_handle); |
44 } | 48 } |
45 | |
46 } // namespace mojo | |
OLD | NEW |