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 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ |
6 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 ClientSpecificId requesting_client_id, | 334 ClientSpecificId requesting_client_id, |
335 mojo::Map<mojo::String, mojo::Array<uint8_t>> | 335 mojo::Map<mojo::String, mojo::Array<uint8_t>> |
336 transport_properties) override; | 336 transport_properties) override; |
337 void WmClientJankinessChanged(ClientSpecificId client_id, | 337 void WmClientJankinessChanged(ClientSpecificId client_id, |
338 bool janky) override; | 338 bool janky) override; |
339 void WmPerformMoveLoop(uint32_t change_id, | 339 void WmPerformMoveLoop(uint32_t change_id, |
340 Id window_id, | 340 Id window_id, |
341 mojom::MoveLoopSource source, | 341 mojom::MoveLoopSource source, |
342 const gfx::Point& cursor_location) override; | 342 const gfx::Point& cursor_location) override; |
343 void WmCancelMoveLoop(uint32_t window_id) override; | 343 void WmCancelMoveLoop(uint32_t window_id) override; |
344 void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override; | 344 void OnAccelerator(uint32_t ack_id, |
| 345 uint32_t accelerator_id, |
| 346 std::unique_ptr<ui::Event> event) override; |
345 | 347 |
346 // Overridden from WindowManagerClient: | 348 // Overridden from WindowManagerClient: |
347 void SetFrameDecorationValues( | 349 void SetFrameDecorationValues( |
348 mojom::FrameDecorationValuesPtr values) override; | 350 mojom::FrameDecorationValuesPtr values) override; |
349 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; | 351 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; |
350 void AddAccelerator(uint32_t id, | 352 void AddAccelerator(uint32_t id, |
351 mojom::EventMatcherPtr event_matcher, | 353 mojom::EventMatcherPtr event_matcher, |
352 const base::Callback<void(bool)>& callback) override; | 354 const base::Callback<void(bool)>& callback) override; |
353 void RemoveAccelerator(uint32_t id) override; | 355 void RemoveAccelerator(uint32_t id) override; |
354 void AddActivationParent(Window* window) override; | 356 void AddActivationParent(Window* window) override; |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 base::Callback<void(bool)> on_current_move_finished_; | 429 base::Callback<void(bool)> on_current_move_finished_; |
428 | 430 |
429 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 431 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
430 | 432 |
431 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 433 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
432 }; | 434 }; |
433 | 435 |
434 } // namespace ui | 436 } // namespace ui |
435 | 437 |
436 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ | 438 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ |
OLD | NEW |