| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 WindowManagerDelegate* window_manager_delegate = nullptr, | 106 WindowManagerDelegate* window_manager_delegate = nullptr, |
| 107 ui::mojom::WindowTreeClientRequest request = nullptr, | 107 ui::mojom::WindowTreeClientRequest request = nullptr, |
| 108 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr, | 108 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr, |
| 109 bool create_discardable_memory = true); | 109 bool create_discardable_memory = true); |
| 110 ~WindowTreeClient() override; | 110 ~WindowTreeClient() override; |
| 111 | 111 |
| 112 // Establishes the connection by way of the WindowTreeFactory. | 112 // Establishes the connection by way of the WindowTreeFactory. |
| 113 void ConnectViaWindowTreeFactory(); | 113 void ConnectViaWindowTreeFactory(); |
| 114 | 114 |
| 115 // Establishes the connection by way of WindowManagerWindowTreeFactory. | 115 // Establishes the connection by way of WindowManagerWindowTreeFactory. |
| 116 void ConnectAsWindowManager(); | 116 // See mojom for details on |automatically_create_display_roots|. |
| 117 void ConnectAsWindowManager(bool automatically_create_display_roots = true); |
| 117 | 118 |
| 118 service_manager::Connector* connector() { return connector_; } | 119 service_manager::Connector* connector() { return connector_; } |
| 119 ui::Gpu* gpu() { return gpu_.get(); } | 120 ui::Gpu* gpu() { return gpu_.get(); } |
| 120 CaptureSynchronizer* capture_synchronizer() { | 121 CaptureSynchronizer* capture_synchronizer() { |
| 121 return capture_synchronizer_.get(); | 122 return capture_synchronizer_.get(); |
| 122 } | 123 } |
| 123 FocusSynchronizer* focus_synchronizer() { return focus_synchronizer_.get(); } | 124 FocusSynchronizer* focus_synchronizer() { return focus_synchronizer_.get(); } |
| 124 | 125 |
| 125 bool connected() const { return tree_ != nullptr; } | 126 bool connected() const { return tree_ != nullptr; } |
| 126 ClientSpecificId client_id() const { return client_id_; } | 127 ClientSpecificId client_id() const { return client_id_; } |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 bool got_initial_displays_ = false; | 610 bool got_initial_displays_ = false; |
| 610 | 611 |
| 611 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 612 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 612 | 613 |
| 613 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 614 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 614 }; | 615 }; |
| 615 | 616 |
| 616 } // namespace aura | 617 } // namespace aura |
| 617 | 618 |
| 618 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 619 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |