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 #ifndef ASH_MUS_WINDOW_MANAGER_H_ | 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_ |
6 #define ASH_MUS_WINDOW_MANAGER_H_ | 6 #define ASH_MUS_WINDOW_MANAGER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 ui::Window* window, | 134 ui::Window* window, |
135 const std::string& name, | 135 const std::string& name, |
136 std::unique_ptr<std::vector<uint8_t>>* new_data) override; | 136 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
137 ui::Window* OnWmCreateTopLevelWindow( | 137 ui::Window* OnWmCreateTopLevelWindow( |
138 std::map<std::string, std::vector<uint8_t>>* properties) override; | 138 std::map<std::string, std::vector<uint8_t>>* properties) override; |
139 void OnWmClientJankinessChanged(const std::set<ui::Window*>& client_windows, | 139 void OnWmClientJankinessChanged(const std::set<ui::Window*>& client_windows, |
140 bool not_responding) override; | 140 bool not_responding) override; |
141 void OnWmNewDisplay(ui::Window* window, | 141 void OnWmNewDisplay(ui::Window* window, |
142 const display::Display& display) override; | 142 const display::Display& display) override; |
143 void OnWmDisplayRemoved(ui::Window* window) override; | 143 void OnWmDisplayRemoved(ui::Window* window) override; |
| 144 void OnWmDisplayModified(const display::Display& display) override; |
144 void OnWmPerformMoveLoop(ui::Window* window, | 145 void OnWmPerformMoveLoop(ui::Window* window, |
145 ui::mojom::MoveLoopSource source, | 146 ui::mojom::MoveLoopSource source, |
146 const gfx::Point& cursor_location, | 147 const gfx::Point& cursor_location, |
147 const base::Callback<void(bool)>& on_done) override; | 148 const base::Callback<void(bool)>& on_done) override; |
148 void OnWmCancelMoveLoop(ui::Window* window) override; | 149 void OnWmCancelMoveLoop(ui::Window* window) override; |
149 ui::mojom::EventResult OnAccelerator(uint32_t id, | 150 ui::mojom::EventResult OnAccelerator(uint32_t id, |
150 const ui::Event& event) override; | 151 const ui::Event& event) override; |
151 | 152 |
152 service_manager::Connector* connector_; | 153 service_manager::Connector* connector_; |
153 | 154 |
(...skipping 19 matching lines...) Expand all Loading... |
173 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; | 174 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; |
174 uint16_t next_accelerator_namespace_id_ = 0u; | 175 uint16_t next_accelerator_namespace_id_ = 0u; |
175 | 176 |
176 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 177 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
177 }; | 178 }; |
178 | 179 |
179 } // namespace mus | 180 } // namespace mus |
180 } // namespace ash | 181 } // namespace ash |
181 | 182 |
182 #endif // ASH_MUS_WINDOW_MANAGER_H_ | 183 #endif // ASH_MUS_WINDOW_MANAGER_H_ |
OLD | NEW |