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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 void WmSetProperty(uint32_t change_id, | 315 void WmSetProperty(uint32_t change_id, |
316 Id window_id, | 316 Id window_id, |
317 const mojo::String& name, | 317 const mojo::String& name, |
318 mojo::Array<uint8_t> transit_data) override; | 318 mojo::Array<uint8_t> transit_data) override; |
319 void WmCreateTopLevelWindow(uint32_t change_id, | 319 void WmCreateTopLevelWindow(uint32_t change_id, |
320 ClientSpecificId requesting_client_id, | 320 ClientSpecificId requesting_client_id, |
321 mojo::Map<mojo::String, mojo::Array<uint8_t>> | 321 mojo::Map<mojo::String, mojo::Array<uint8_t>> |
322 transport_properties) override; | 322 transport_properties) override; |
323 void WmClientJankinessChanged(ClientSpecificId client_id, | 323 void WmClientJankinessChanged(ClientSpecificId client_id, |
324 bool janky) override; | 324 bool janky) override; |
325 void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override; | 325 void OnAccelerator(uint32_t ack_id, |
| 326 uint32_t accelerator_id, |
| 327 std::unique_ptr<ui::Event> event) override; |
326 | 328 |
327 // Overridden from WindowManagerClient: | 329 // Overridden from WindowManagerClient: |
328 void SetFrameDecorationValues( | 330 void SetFrameDecorationValues( |
329 mojom::FrameDecorationValuesPtr values) override; | 331 mojom::FrameDecorationValuesPtr values) override; |
330 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; | 332 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; |
331 void AddAccelerator(uint32_t id, | 333 void AddAccelerator(uint32_t id, |
332 mojom::EventMatcherPtr event_matcher, | 334 mojom::EventMatcherPtr event_matcher, |
333 const base::Callback<void(bool)>& callback) override; | 335 const base::Callback<void(bool)>& callback) override; |
334 void RemoveAccelerator(uint32_t id) override; | 336 void RemoveAccelerator(uint32_t id) override; |
335 void AddActivationParent(Window* window) override; | 337 void AddActivationParent(Window* window) override; |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 uint32_t event_observer_id_ = 0u; | 399 uint32_t event_observer_id_ = 0u; |
398 | 400 |
399 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 401 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
400 | 402 |
401 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 403 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
402 }; | 404 }; |
403 | 405 |
404 } // namespace ui | 406 } // namespace ui |
405 | 407 |
406 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ | 408 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ |
OLD | NEW |