| 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 "components/mus/public/cpp/window.h" | 5 #include "components/mus/public/cpp/window.h" |
| 6 #include "components/mus/public/cpp/window_manager_delegate.h" | 6 #include "components/mus/public/cpp/window_manager_delegate.h" |
| 7 #include "components/mus/public/cpp/window_tree_connection.h" | 7 #include "components/mus/public/cpp/window_tree_connection.h" |
| 8 #include "components/mus/public/cpp/window_tree_delegate.h" | 8 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 9 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" | 9 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" |
| 10 #include "mojo/converters/geometry/geometry_type_converters.h" | |
| 11 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| 12 #include "mojo/public/cpp/bindings/binding.h" | 11 #include "mojo/public/cpp/bindings/binding.h" |
| 13 #include "services/shell/public/cpp/application_runner.h" | 12 #include "services/shell/public/cpp/application_runner.h" |
| 14 #include "services/shell/public/cpp/connector.h" | 13 #include "services/shell/public/cpp/connector.h" |
| 15 #include "services/shell/public/cpp/shell_client.h" | 14 #include "services/shell/public/cpp/shell_client.h" |
| 16 #include "ui/display/display.h" | 15 #include "ui/display/display.h" |
| 16 #include "ui/gfx/geometry/mojo/geometry_type_converters.h" |
| 17 #include "ui/mojo/display/display_type_converters.h" | 17 #include "ui/mojo/display/display_type_converters.h" |
| 18 | 18 |
| 19 namespace mus { | 19 namespace mus { |
| 20 namespace test { | 20 namespace test { |
| 21 | 21 |
| 22 class TestWM : public shell::ShellClient, | 22 class TestWM : public shell::ShellClient, |
| 23 public mus::mojom::WindowManagerFactory, | 23 public mus::mojom::WindowManagerFactory, |
| 24 public mus::WindowTreeDelegate, | 24 public mus::WindowTreeDelegate, |
| 25 public mus::WindowManagerDelegate { | 25 public mus::WindowManagerDelegate { |
| 26 public: | 26 public: |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 DISALLOW_COPY_AND_ASSIGN(TestWM); | 105 DISALLOW_COPY_AND_ASSIGN(TestWM); |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 } // namespace test | 108 } // namespace test |
| 109 } // namespace mus | 109 } // namespace mus |
| 110 | 110 |
| 111 MojoResult MojoMain(MojoHandle shell_handle) { | 111 MojoResult MojoMain(MojoHandle shell_handle) { |
| 112 shell::ApplicationRunner runner(new mus::test::TestWM); | 112 shell::ApplicationRunner runner(new mus::test::TestWM); |
| 113 return runner.Run(shell_handle); | 113 return runner.Run(shell_handle); |
| 114 } | 114 } |
| OLD | NEW |