| 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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 // Overrided from FocusSynchronizerDelegate: | 471 // Overrided from FocusSynchronizerDelegate: |
| 472 uint32_t CreateChangeIdForFocus(WindowMus* window) override; | 472 uint32_t CreateChangeIdForFocus(WindowMus* window) override; |
| 473 | 473 |
| 474 // The one int in |cursor_location_mapping_|. When we read from this | 474 // The one int in |cursor_location_mapping_|. When we read from this |
| 475 // location, we must always read from it atomically. | 475 // location, we must always read from it atomically. |
| 476 base::subtle::Atomic32* cursor_location_memory() { | 476 base::subtle::Atomic32* cursor_location_memory() { |
| 477 return reinterpret_cast<base::subtle::Atomic32*>( | 477 return reinterpret_cast<base::subtle::Atomic32*>( |
| 478 cursor_location_mapping_.get()); | 478 cursor_location_mapping_.get()); |
| 479 } | 479 } |
| 480 | 480 |
| 481 // Helper function to get the WindowTreeHostMus with the |display_id|. |
| 482 WindowTreeHostMus* GetWindowTreeHostMusWithDisplayId(int64_t display_id); |
| 483 |
| 481 // This may be null in tests. | 484 // This may be null in tests. |
| 482 service_manager::Connector* connector_; | 485 service_manager::Connector* connector_; |
| 483 | 486 |
| 484 // This is set once and only once when we get OnEmbed(). It gives the unique | 487 // This is set once and only once when we get OnEmbed(). It gives the unique |
| 485 // id for this client. | 488 // id for this client. |
| 486 ClientSpecificId client_id_; | 489 ClientSpecificId client_id_; |
| 487 | 490 |
| 488 // Id assigned to the next window created. | 491 // Id assigned to the next window created. |
| 489 ClientSpecificId next_window_id_; | 492 ClientSpecificId next_window_id_; |
| 490 | 493 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 // ContextFactory that was set on Env originally. | 553 // ContextFactory that was set on Env originally. |
| 551 ui::ContextFactory* initial_context_factory_ = nullptr; | 554 ui::ContextFactory* initial_context_factory_ = nullptr; |
| 552 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 555 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 553 | 556 |
| 554 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 557 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 555 }; | 558 }; |
| 556 | 559 |
| 557 } // namespace aura | 560 } // namespace aura |
| 558 | 561 |
| 559 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 562 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |