| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 public: | 55 public: |
| 56 ~WindowManagerConnection() override; | 56 ~WindowManagerConnection() override; |
| 57 | 57 |
| 58 static std::unique_ptr<WindowManagerConnection> Create( | 58 static std::unique_ptr<WindowManagerConnection> Create( |
| 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 shell::Connector* connector() { return connector_; } | 64 shell::Connector* connector() { return connector_; } |
| 65 ui::GpuService* gpu_service() { return gpu_service_.get(); } |
| 65 | 66 |
| 66 ui::Window* NewWindow( | 67 ui::Window* NewWindow( |
| 67 const std::map<std::string, std::vector<uint8_t>>& properties); | 68 const std::map<std::string, std::vector<uint8_t>>& properties); |
| 68 | 69 |
| 69 NativeWidget* CreateNativeWidgetMus( | 70 NativeWidget* CreateNativeWidgetMus( |
| 70 const std::map<std::string, std::vector<uint8_t>>& properties, | 71 const std::map<std::string, std::vector<uint8_t>>& properties, |
| 71 const Widget::InitParams& init_params, | 72 const Widget::InitParams& init_params, |
| 72 internal::NativeWidgetDelegate* delegate); | 73 internal::NativeWidgetDelegate* delegate); |
| 73 | 74 |
| 74 void AddPointerWatcher(PointerWatcher* watcher); | 75 void AddPointerWatcher(PointerWatcher* watcher); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 // Must be empty on destruction. | 110 // Must be empty on destruction. |
| 110 base::ObserverList<PointerWatcher, true> pointer_watchers_; | 111 base::ObserverList<PointerWatcher, true> pointer_watchers_; |
| 111 base::ObserverList<TouchEventWatcher, true> touch_event_watchers_; | 112 base::ObserverList<TouchEventWatcher, true> touch_event_watchers_; |
| 112 | 113 |
| 113 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 114 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 114 }; | 115 }; |
| 115 | 116 |
| 116 } // namespace views | 117 } // namespace views |
| 117 | 118 |
| 118 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 119 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |