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/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "mojo/application/application_runner_chromium.h" |
6 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
7 #include "mojo/public/cpp/application/application_delegate.h" | 8 #include "mojo/public/cpp/application/application_delegate.h" |
8 #include "mojo/public/cpp/application/application_runner_chromium.h" | |
9 #include "mojo/public/cpp/application/service_provider_impl.h" | 9 #include "mojo/public/cpp/application/service_provider_impl.h" |
10 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 10 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
11 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 11 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
12 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h" | 12 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h" |
13 #include "mojo/services/window_manager/window_manager_app.h" | 13 #include "mojo/services/window_manager/window_manager_app.h" |
14 | 14 |
15 // ApplicationDelegate implementation file for WindowManager users (e.g. | 15 // ApplicationDelegate implementation file for WindowManager users (e.g. |
16 // core window manager tests) that do not want to provide their own | 16 // core window manager tests) that do not want to provide their own |
17 // ApplicationDelegate::Create(). | 17 // ApplicationDelegate::Create(). |
18 | 18 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 | 70 |
71 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); | 71 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); |
72 }; | 72 }; |
73 | 73 |
74 } // namespace mojo | 74 } // namespace mojo |
75 | 75 |
76 MojoResult MojoMain(MojoHandle shell_handle) { | 76 MojoResult MojoMain(MojoHandle shell_handle) { |
77 mojo::ApplicationRunnerChromium runner(new mojo::DefaultWindowManager); | 77 mojo::ApplicationRunnerChromium runner(new mojo::DefaultWindowManager); |
78 return runner.Run(shell_handle); | 78 return runner.Run(shell_handle); |
79 } | 79 } |
OLD | NEW |