| 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/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| 11 #include "mojo/public/cpp/bindings/binding.h" | 11 #include "mojo/public/cpp/bindings/binding.h" |
| 12 #include "services/shell/public/cpp/application_runner.h" | 12 #include "services/shell/public/cpp/application_runner.h" |
| 13 #include "services/shell/public/cpp/connector.h" | 13 #include "services/shell/public/cpp/connector.h" |
| 14 #include "services/shell/public/cpp/shell_client.h" | 14 #include "services/shell/public/cpp/shell_client.h" |
| 15 #include "ui/display/display.h" | 15 #include "ui/display/display.h" |
| 16 #include "ui/display/mojo/display_type_converters.h" | 16 #include "ui/display/mojo/display_type_converters.h" |
| 17 #include "ui/gfx/geometry/mojo/geometry_type_converters.h" | |
| 18 | 17 |
| 19 namespace mus { | 18 namespace mus { |
| 20 namespace test { | 19 namespace test { |
| 21 | 20 |
| 22 class TestWM : public shell::ShellClient, | 21 class TestWM : public shell::ShellClient, |
| 23 public mus::mojom::WindowManagerFactory, | 22 public mus::mojom::WindowManagerFactory, |
| 24 public mus::WindowTreeDelegate, | 23 public mus::WindowTreeDelegate, |
| 25 public mus::WindowManagerDelegate { | 24 public mus::WindowManagerDelegate { |
| 26 public: | 25 public: |
| 27 TestWM() : window_manager_factory_binding_(this) {} | 26 TestWM() : window_manager_factory_binding_(this) {} |
| (...skipping 21 matching lines...) Expand all Loading... |
| 49 this, std::move(request), | 48 this, std::move(request), |
| 50 mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED, this); | 49 mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED, this); |
| 51 } | 50 } |
| 52 | 51 |
| 53 // mus::WindowTreeDelegate: | 52 // mus::WindowTreeDelegate: |
| 54 void OnEmbed(mus::Window* root) override { | 53 void OnEmbed(mus::Window* root) override { |
| 55 root_ = root; | 54 root_ = root; |
| 56 window_manager_client_->AddActivationParent(root_); | 55 window_manager_client_->AddActivationParent(root_); |
| 57 mus::mojom::FrameDecorationValuesPtr frame_decoration_values = | 56 mus::mojom::FrameDecorationValuesPtr frame_decoration_values = |
| 58 mus::mojom::FrameDecorationValues::New(); | 57 mus::mojom::FrameDecorationValues::New(); |
| 59 frame_decoration_values->normal_client_area_insets = | |
| 60 mojo::Insets::From(gfx::Insets()); | |
| 61 frame_decoration_values->maximized_client_area_insets = | |
| 62 mojo::Insets::From(gfx::Insets()); | |
| 63 frame_decoration_values->max_title_bar_button_width = 0; | 58 frame_decoration_values->max_title_bar_button_width = 0; |
| 64 window_manager_client_->SetFrameDecorationValues( | 59 window_manager_client_->SetFrameDecorationValues( |
| 65 std::move(frame_decoration_values)); | 60 std::move(frame_decoration_values)); |
| 66 } | 61 } |
| 67 void OnConnectionLost(mus::WindowTreeConnection* connection) override { | 62 void OnConnectionLost(mus::WindowTreeConnection* connection) override { |
| 68 } | 63 } |
| 69 void OnEventObserved(const ui::Event& event, mus::Window* target) override { | 64 void OnEventObserved(const ui::Event& event, mus::Window* target) override { |
| 70 // Don't care. | 65 // Don't care. |
| 71 } | 66 } |
| 72 | 67 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 DISALLOW_COPY_AND_ASSIGN(TestWM); | 101 DISALLOW_COPY_AND_ASSIGN(TestWM); |
| 107 }; | 102 }; |
| 108 | 103 |
| 109 } // namespace test | 104 } // namespace test |
| 110 } // namespace mus | 105 } // namespace mus |
| 111 | 106 |
| 112 MojoResult MojoMain(MojoHandle shell_handle) { | 107 MojoResult MojoMain(MojoHandle shell_handle) { |
| 113 shell::ApplicationRunner runner(new mus::test::TestWM); | 108 shell::ApplicationRunner runner(new mus::test::TestWM); |
| 114 return runner.Run(shell_handle); | 109 return runner.Run(shell_handle); |
| 115 } | 110 } |
| OLD | NEW |