| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <map> | 5 #include <map> |
| 6 #include <memory> | 6 #include <memory> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 void OnEmbed( | 42 void OnEmbed( |
| 43 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override { | 43 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override { |
| 44 window_tree_host_ = std::move(window_tree_host); | 44 window_tree_host_ = std::move(window_tree_host); |
| 45 run_loop_.Quit(); | 45 run_loop_.Quit(); |
| 46 } | 46 } |
| 47 void OnEmbedRootDestroyed( | 47 void OnEmbedRootDestroyed( |
| 48 aura::WindowTreeHostMus* window_tree_host) override {} | 48 aura::WindowTreeHostMus* window_tree_host) override {} |
| 49 void OnLostConnection(aura::WindowTreeClient* client) override {} | 49 void OnLostConnection(aura::WindowTreeClient* client) override {} |
| 50 void OnPointerEventObserved(const ui::PointerEvent& event, | 50 void OnPointerEventObserved(const ui::PointerEvent& event, |
| 51 aura::Window* target) override {} | 51 aura::Window* target) override {} |
| 52 aura::client::CaptureClient* GetCaptureClient() override { | |
| 53 return wm_state_.capture_controller(); | |
| 54 } | |
| 55 aura::PropertyConverter* GetPropertyConverter() override { | 52 aura::PropertyConverter* GetPropertyConverter() override { |
| 56 return &property_converter_; | 53 return &property_converter_; |
| 57 } | 54 } |
| 58 | 55 |
| 59 base::RunLoop run_loop_; | 56 base::RunLoop run_loop_; |
| 60 wm::WMState wm_state_; | 57 wm::WMState wm_state_; |
| 61 aura::PropertyConverter property_converter_; | 58 aura::PropertyConverter property_converter_; |
| 62 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_; | 59 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_; |
| 63 | 60 |
| 64 DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate); | 61 DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 client.Embed(child_window, std::move(tree_client), 0u, base::Bind(&OnEmbed)); | 107 client.Embed(child_window, std::move(tree_client), 0u, base::Bind(&OnEmbed)); |
| 111 aura::WindowTreeClient child_client(connector(), &window_tree_delegate, | 108 aura::WindowTreeClient child_client(connector(), &window_tree_delegate, |
| 112 nullptr, std::move(tree_client_request)); | 109 nullptr, std::move(tree_client_request)); |
| 113 window_tree_delegate.WaitForEmbed(); | 110 window_tree_delegate.WaitForEmbed(); |
| 114 ASSERT_TRUE(!child_client.GetRoots().empty()); | 111 ASSERT_TRUE(!child_client.GetRoots().empty()); |
| 115 window_tree_delegate.DestroyWindowTreeHost(); | 112 window_tree_delegate.DestroyWindowTreeHost(); |
| 116 } | 113 } |
| 117 | 114 |
| 118 } // namespace mus | 115 } // namespace mus |
| 119 } // namespace ash | 116 } // namespace ash |
| OLD | NEW |