| 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 UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 5 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| 6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 // Overrided from FocusSynchronizerDelegate: | 468 // Overrided from FocusSynchronizerDelegate: |
| 469 uint32_t CreateChangeIdForFocus(WindowMus* window) override; | 469 uint32_t CreateChangeIdForFocus(WindowMus* window) override; |
| 470 | 470 |
| 471 // The one int in |cursor_location_mapping_|. When we read from this | 471 // The one int in |cursor_location_mapping_|. When we read from this |
| 472 // location, we must always read from it atomically. | 472 // location, we must always read from it atomically. |
| 473 base::subtle::Atomic32* cursor_location_memory() { | 473 base::subtle::Atomic32* cursor_location_memory() { |
| 474 return reinterpret_cast<base::subtle::Atomic32*>( | 474 return reinterpret_cast<base::subtle::Atomic32*>( |
| 475 cursor_location_mapping_.get()); | 475 cursor_location_mapping_.get()); |
| 476 } | 476 } |
| 477 | 477 |
| 478 // Helper function to get the WindowTreeHostMus with the |display_id|. |
| 479 WindowTreeHostMus* GetWindowTreeHostMusWithDisplayId(int64_t display_id); |
| 480 |
| 478 // This may be null in tests. | 481 // This may be null in tests. |
| 479 service_manager::Connector* connector_; | 482 service_manager::Connector* connector_; |
| 480 | 483 |
| 481 // This is set once and only once when we get OnEmbed(). It gives the unique | 484 // This is set once and only once when we get OnEmbed(). It gives the unique |
| 482 // id for this client. | 485 // id for this client. |
| 483 ClientSpecificId client_id_; | 486 ClientSpecificId client_id_; |
| 484 | 487 |
| 485 // Id assigned to the next window created. | 488 // Id assigned to the next window created. |
| 486 ClientSpecificId next_window_id_; | 489 ClientSpecificId next_window_id_; |
| 487 | 490 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 std::unique_ptr<ui::Gpu> gpu_; | 546 std::unique_ptr<ui::Gpu> gpu_; |
| 544 std::unique_ptr<MusContextFactory> compositor_context_factory_; | 547 std::unique_ptr<MusContextFactory> compositor_context_factory_; |
| 545 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 548 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 546 | 549 |
| 547 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 550 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 548 }; | 551 }; |
| 549 | 552 |
| 550 } // namespace aura | 553 } // namespace aura |
| 551 | 554 |
| 552 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 555 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |