OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/macros.h" | 5 #include "base/macros.h" |
6 #include "components/mus/public/cpp/property_type_converters.h" | 6 #include "components/mus/public/cpp/property_type_converters.h" |
7 #include "mash/wm/public/interfaces/container.mojom.h" | 7 #include "mash/wm/public/interfaces/container.mojom.h" |
8 #include "mojo/application/public/cpp/application_connection.h" | |
9 #include "mojo/application/public/cpp/application_delegate.h" | |
10 #include "mojo/application/public/cpp/application_impl.h" | |
11 #include "mojo/application/public/cpp/application_runner.h" | |
12 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
13 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 9 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 10 #include "mojo/shell/public/cpp/application_connection.h" |
| 11 #include "mojo/shell/public/cpp/application_delegate.h" |
| 12 #include "mojo/shell/public/cpp/application_impl.h" |
| 13 #include "mojo/shell/public/cpp/application_runner.h" |
14 #include "ui/gfx/canvas.h" | 14 #include "ui/gfx/canvas.h" |
15 #include "ui/views/mus/aura_init.h" | 15 #include "ui/views/mus/aura_init.h" |
16 #include "ui/views/mus/native_widget_mus.h" | 16 #include "ui/views/mus/native_widget_mus.h" |
17 #include "ui/views/mus/window_manager_connection.h" | 17 #include "ui/views/mus/window_manager_connection.h" |
18 #include "ui/views/widget/widget_delegate.h" | 18 #include "ui/views/widget/widget_delegate.h" |
19 | 19 |
20 namespace mash { | 20 namespace mash { |
21 namespace wallpaper { | 21 namespace wallpaper { |
22 namespace { | 22 namespace { |
23 | 23 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 | 75 |
76 } // namespace | 76 } // namespace |
77 } // namespace wallpaper | 77 } // namespace wallpaper |
78 } // namespace mash | 78 } // namespace mash |
79 | 79 |
80 MojoResult MojoMain(MojoHandle shell_handle) { | 80 MojoResult MojoMain(MojoHandle shell_handle) { |
81 mojo::ApplicationRunner runner( | 81 mojo::ApplicationRunner runner( |
82 new mash::wallpaper::WallpaperApplicationDelegate); | 82 new mash::wallpaper::WallpaperApplicationDelegate); |
83 return runner.Run(shell_handle); | 83 return runner.Run(shell_handle); |
84 } | 84 } |
OLD | NEW |