OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 std::map<std::string, std::vector<uint8_t>>* properties) override { | 60 std::map<std::string, std::vector<uint8_t>>* properties) override { |
61 return nullptr; | 61 return nullptr; |
62 } | 62 } |
63 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, | 63 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, |
64 bool not_responding) override {} | 64 bool not_responding) override {} |
65 void OnWmWillCreateDisplay(const display::Display& display) override {} | 65 void OnWmWillCreateDisplay(const display::Display& display) override {} |
66 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, | 66 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, |
67 const display::Display& display) override {} | 67 const display::Display& display) override {} |
68 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override {} | 68 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override {} |
69 void OnWmDisplayModified(const display::Display& display) override {} | 69 void OnWmDisplayModified(const display::Display& display) override {} |
70 mojom::EventResult OnAccelerator(uint32_t accelerator_id, | 70 mojom::EventResult OnAccelerator( |
71 const ui::Event& event) override { | 71 uint32_t accelerator_id, |
| 72 const ui::Event& event, |
| 73 std::unordered_map<std::string, std::vector<uint8_t>>* properties) |
| 74 override { |
72 return ui::mojom::EventResult::UNHANDLED; | 75 return ui::mojom::EventResult::UNHANDLED; |
73 } | 76 } |
74 void OnWmPerformMoveLoop(aura::Window* window, | 77 void OnWmPerformMoveLoop(aura::Window* window, |
75 mojom::MoveLoopSource source, | 78 mojom::MoveLoopSource source, |
76 const gfx::Point& cursor_location, | 79 const gfx::Point& cursor_location, |
77 const base::Callback<void(bool)>& on_done) override { | 80 const base::Callback<void(bool)>& on_done) override { |
78 } | 81 } |
79 void OnWmCancelMoveLoop(aura::Window* window) override {} | 82 void OnWmCancelMoveLoop(aura::Window* window) override {} |
80 void OnWmSetClientArea( | 83 void OnWmSetClientArea( |
81 aura::Window* window, | 84 aura::Window* window, |
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
768 ASSERT_EQ(1u, top_level_in_wm->children().size()); | 771 ASSERT_EQ(1u, top_level_in_wm->children().size()); |
769 aura::Window* second_client_child_in_wm = top_level_in_wm->children()[0]; | 772 aura::Window* second_client_child_in_wm = top_level_in_wm->children()[0]; |
770 ASSERT_EQ(1u, second_client_child_in_wm->children().size()); | 773 ASSERT_EQ(1u, second_client_child_in_wm->children().size()); |
771 aura::Window* transient_in_wm = second_client_child_in_wm->children()[0]; | 774 aura::Window* transient_in_wm = second_client_child_in_wm->children()[0]; |
772 ASSERT_EQ(second_client_child_in_wm, | 775 ASSERT_EQ(second_client_child_in_wm, |
773 transient_window_client->GetTransientParent(transient_in_wm)); | 776 transient_window_client->GetTransientParent(transient_in_wm)); |
774 } | 777 } |
775 | 778 |
776 } // namespace ws | 779 } // namespace ws |
777 } // namespace ui | 780 } // namespace ui |
OLD | NEW |