| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 5 #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 shell::Connector* connector, | 59 shell::Connector* connector, |
| 60 const shell::Identity& identity); | 60 const shell::Identity& identity); |
| 61 static WindowManagerConnection* Get(); | 61 static WindowManagerConnection* Get(); |
| 62 static bool Exists(); | 62 static bool Exists(); |
| 63 | 63 |
| 64 PointerWatcherEventRouter* pointer_watcher_event_router() { | 64 PointerWatcherEventRouter* pointer_watcher_event_router() { |
| 65 return pointer_watcher_event_router_.get(); | 65 return pointer_watcher_event_router_.get(); |
| 66 } | 66 } |
| 67 shell::Connector* connector() { return connector_; } | 67 shell::Connector* connector() { return connector_; } |
| 68 ui::GpuService* gpu_service() { return gpu_service_.get(); } | 68 ui::GpuService* gpu_service() { return gpu_service_.get(); } |
| 69 ui::WindowTreeClient* client() { return client_.get(); } |
| 69 | 70 |
| 70 ui::Window* NewWindow( | 71 ui::Window* NewWindow( |
| 71 const std::map<std::string, std::vector<uint8_t>>& properties); | 72 const std::map<std::string, std::vector<uint8_t>>& properties); |
| 72 | 73 |
| 73 NativeWidget* CreateNativeWidgetMus( | 74 NativeWidget* CreateNativeWidgetMus( |
| 74 const std::map<std::string, std::vector<uint8_t>>& properties, | 75 const std::map<std::string, std::vector<uint8_t>>& properties, |
| 75 const Widget::InitParams& init_params, | 76 const Widget::InitParams& init_params, |
| 76 internal::NativeWidgetDelegate* delegate); | 77 internal::NativeWidgetDelegate* delegate); |
| 77 | 78 |
| 78 const std::set<ui::Window*>& GetRoots() const; | 79 const std::set<ui::Window*>& GetRoots() const; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 101 std::unique_ptr<ui::GpuService> gpu_service_; | 102 std::unique_ptr<ui::GpuService> gpu_service_; |
| 102 std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_; | 103 std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_; |
| 103 std::unique_ptr<SurfaceContextFactory> compositor_context_factory_; | 104 std::unique_ptr<SurfaceContextFactory> compositor_context_factory_; |
| 104 | 105 |
| 105 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 106 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 106 }; | 107 }; |
| 107 | 108 |
| 108 } // namespace views | 109 } // namespace views |
| 109 | 110 |
| 110 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 111 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |