| 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 <memory> | 5 #include <memory> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
| 10 #include "mojo/public/cpp/bindings/binding.h" | 10 #include "mojo/public/cpp/bindings/binding.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 void OnEmbed( | 78 void OnEmbed( |
| 79 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override { | 79 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override { |
| 80 // WindowTreeClients configured as the window manager should never get | 80 // WindowTreeClients configured as the window manager should never get |
| 81 // OnEmbed(). | 81 // OnEmbed(). |
| 82 NOTREACHED(); | 82 NOTREACHED(); |
| 83 } | 83 } |
| 84 void OnLostConnection(aura::WindowTreeClient* client) override { | 84 void OnLostConnection(aura::WindowTreeClient* client) override { |
| 85 window_tree_host_.reset(); | 85 window_tree_host_.reset(); |
| 86 window_tree_client_.reset(); | 86 window_tree_client_.reset(); |
| 87 } | 87 } |
| 88 void OnEmbedRootDestroyed(aura::Window* root) override { | 88 void OnEmbedRootDestroyed( |
| 89 aura::WindowTreeHostMus* window_tree_host) override { |
| 89 // WindowTreeClients configured as the window manager should never get | 90 // WindowTreeClients configured as the window manager should never get |
| 90 // OnEmbedRootDestroyed(). | 91 // OnEmbedRootDestroyed(). |
| 91 NOTREACHED(); | 92 NOTREACHED(); |
| 92 } | 93 } |
| 93 void OnPointerEventObserved(const ui::PointerEvent& event, | 94 void OnPointerEventObserved(const ui::PointerEvent& event, |
| 94 aura::Window* target) override { | 95 aura::Window* target) override { |
| 95 // Don't care. | 96 // Don't care. |
| 96 } | 97 } |
| 97 aura::client::CaptureClient* GetCaptureClient() override { | 98 aura::client::CaptureClient* GetCaptureClient() override { |
| 98 return wm_state_.capture_controller(); | 99 return wm_state_.capture_controller(); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 DISALLOW_COPY_AND_ASSIGN(TestWM); | 186 DISALLOW_COPY_AND_ASSIGN(TestWM); |
| 186 }; | 187 }; |
| 187 | 188 |
| 188 } // namespace test | 189 } // namespace test |
| 189 } // namespace ui | 190 } // namespace ui |
| 190 | 191 |
| 191 MojoResult ServiceMain(MojoHandle service_request_handle) { | 192 MojoResult ServiceMain(MojoHandle service_request_handle) { |
| 192 service_manager::ServiceRunner runner(new ui::test::TestWM); | 193 service_manager::ServiceRunner runner(new ui::test::TestWM); |
| 193 return runner.Run(service_request_handle); | 194 return runner.Run(service_request_handle); |
| 194 } | 195 } |
| OLD | NEW |