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 "components/view_manager/public/cpp/view_manager.h" | 6 #include "components/view_manager/public/cpp/view_manager.h" |
7 #include "components/view_manager/public/cpp/view_manager_delegate.h" | 7 #include "components/view_manager/public/cpp/view_manager_delegate.h" |
8 #include "components/window_manager/window_manager_app.h" | 8 #include "components/window_manager/window_manager_app.h" |
9 #include "components/window_manager/window_manager_delegate.h" | 9 #include "components/window_manager/window_manager_delegate.h" |
10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
| 11 #include "mojo/application/public/cpp/application_delegate.h" |
| 12 #include "mojo/application/public/cpp/service_provider_impl.h" |
11 #include "mojo/common/tracing_impl.h" | 13 #include "mojo/common/tracing_impl.h" |
12 #include "third_party/mojo/src/mojo/public/c/system/main.h" | 14 #include "third_party/mojo/src/mojo/public/c/system/main.h" |
13 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.
h" | |
14 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl
.h" | |
15 | 15 |
16 // ApplicationDelegate implementation file for WindowManager users (e.g. | 16 // ApplicationDelegate implementation file for WindowManager users (e.g. |
17 // core window manager tests) that do not want to provide their own | 17 // core window manager tests) that do not want to provide their own |
18 // ApplicationDelegate::Create(). | 18 // ApplicationDelegate::Create(). |
19 | 19 |
20 using mojo::View; | 20 using mojo::View; |
21 using mojo::ViewManager; | 21 using mojo::ViewManager; |
22 | 22 |
23 namespace window_manager { | 23 namespace window_manager { |
24 | 24 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); | 80 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); |
81 }; | 81 }; |
82 | 82 |
83 } // namespace window_manager | 83 } // namespace window_manager |
84 | 84 |
85 MojoResult MojoMain(MojoHandle shell_handle) { | 85 MojoResult MojoMain(MojoHandle shell_handle) { |
86 mojo::ApplicationRunnerChromium runner( | 86 mojo::ApplicationRunnerChromium runner( |
87 new window_manager::DefaultWindowManager); | 87 new window_manager::DefaultWindowManager); |
88 return runner.Run(shell_handle); | 88 return runner.Run(shell_handle); |
89 } | 89 } |
OLD | NEW |