| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 void OnEmbedRootDestroyed( | 80 void OnEmbedRootDestroyed( |
| 81 aura::WindowTreeHostMus* window_tree_host) override { | 81 aura::WindowTreeHostMus* window_tree_host) override { |
| 82 // WindowTreeClients configured as the window manager should never get | 82 // WindowTreeClients configured as the window manager should never get |
| 83 // OnEmbedRootDestroyed(). | 83 // OnEmbedRootDestroyed(). |
| 84 NOTREACHED(); | 84 NOTREACHED(); |
| 85 } | 85 } |
| 86 void OnPointerEventObserved(const ui::PointerEvent& event, | 86 void OnPointerEventObserved(const ui::PointerEvent& event, |
| 87 aura::Window* target) override { | 87 aura::Window* target) override { |
| 88 // Don't care. | 88 // Don't care. |
| 89 } | 89 } |
| 90 aura::client::CaptureClient* GetCaptureClient() override { | |
| 91 return wm_state_.capture_controller(); | |
| 92 } | |
| 93 aura::PropertyConverter* GetPropertyConverter() override { | 90 aura::PropertyConverter* GetPropertyConverter() override { |
| 94 return &property_converter_; | 91 return &property_converter_; |
| 95 } | 92 } |
| 96 | 93 |
| 97 // aura::WindowManagerDelegate: | 94 // aura::WindowManagerDelegate: |
| 98 void SetWindowManagerClient(aura::WindowManagerClient* client) override { | 95 void SetWindowManagerClient(aura::WindowManagerClient* client) override { |
| 99 window_manager_client_ = client; | 96 window_manager_client_ = client; |
| 100 } | 97 } |
| 101 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override { | 98 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override { |
| 102 return true; | 99 return true; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 DISALLOW_COPY_AND_ASSIGN(TestWM); | 181 DISALLOW_COPY_AND_ASSIGN(TestWM); |
| 185 }; | 182 }; |
| 186 | 183 |
| 187 } // namespace test | 184 } // namespace test |
| 188 } // namespace ui | 185 } // namespace ui |
| 189 | 186 |
| 190 MojoResult ServiceMain(MojoHandle service_request_handle) { | 187 MojoResult ServiceMain(MojoHandle service_request_handle) { |
| 191 service_manager::ServiceRunner runner(new ui::test::TestWM); | 188 service_manager::ServiceRunner runner(new ui::test::TestWM); |
| 192 return runner.Run(service_request_handle); | 189 return runner.Run(service_request_handle); |
| 193 } | 190 } |
| OLD | NEW |