| 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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 // Overrided from FocusSynchronizerDelegate: | 484 // Overrided from FocusSynchronizerDelegate: |
| 485 uint32_t CreateChangeIdForFocus(WindowMus* window) override; | 485 uint32_t CreateChangeIdForFocus(WindowMus* window) override; |
| 486 | 486 |
| 487 // The one int in |cursor_location_mapping_|. When we read from this | 487 // The one int in |cursor_location_mapping_|. When we read from this |
| 488 // location, we must always read from it atomically. | 488 // location, we must always read from it atomically. |
| 489 base::subtle::Atomic32* cursor_location_memory() { | 489 base::subtle::Atomic32* cursor_location_memory() { |
| 490 return reinterpret_cast<base::subtle::Atomic32*>( | 490 return reinterpret_cast<base::subtle::Atomic32*>( |
| 491 cursor_location_mapping_.get()); | 491 cursor_location_mapping_.get()); |
| 492 } | 492 } |
| 493 | 493 |
| 494 // Helper function to get the WindowTreeHostMus with the |display_id|. |
| 495 WindowTreeHostMus* GetWindowTreeHostMusWithDisplayId(int64_t display_id); |
| 496 |
| 494 // This may be null in tests. | 497 // This may be null in tests. |
| 495 service_manager::Connector* connector_; | 498 service_manager::Connector* connector_; |
| 496 | 499 |
| 497 // This is set once and only once when we get OnEmbed(). It gives the unique | 500 // This is set once and only once when we get OnEmbed(). It gives the unique |
| 498 // id for this client. | 501 // id for this client. |
| 499 ClientSpecificId client_id_; | 502 ClientSpecificId client_id_; |
| 500 | 503 |
| 501 // Id assigned to the next window created. | 504 // Id assigned to the next window created. |
| 502 ClientSpecificId next_window_id_; | 505 ClientSpecificId next_window_id_; |
| 503 | 506 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 // ContextFactory that was set on Env originally. | 572 // ContextFactory that was set on Env originally. |
| 570 ui::ContextFactory* initial_context_factory_ = nullptr; | 573 ui::ContextFactory* initial_context_factory_ = nullptr; |
| 571 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 574 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 572 | 575 |
| 573 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 576 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 574 }; | 577 }; |
| 575 | 578 |
| 576 } // namespace aura | 579 } // namespace aura |
| 577 | 580 |
| 578 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 581 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |