| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 public: | 53 public: |
| 54 ~WindowManagerConnection() override; | 54 ~WindowManagerConnection() override; |
| 55 | 55 |
| 56 static std::unique_ptr<WindowManagerConnection> Create( | 56 static std::unique_ptr<WindowManagerConnection> Create( |
| 57 shell::Connector* connector, | 57 shell::Connector* connector, |
| 58 const shell::Identity& identity); | 58 const shell::Identity& identity); |
| 59 static WindowManagerConnection* Get(); | 59 static WindowManagerConnection* Get(); |
| 60 static bool Exists(); | 60 static bool Exists(); |
| 61 | 61 |
| 62 shell::Connector* connector() { return connector_; } | 62 shell::Connector* connector() { return connector_; } |
| 63 ui::GpuService* gpu_service() { return gpu_service_.get(); } |
| 63 | 64 |
| 64 ui::Window* NewWindow( | 65 ui::Window* NewWindow( |
| 65 const std::map<std::string, std::vector<uint8_t>>& properties); | 66 const std::map<std::string, std::vector<uint8_t>>& properties); |
| 66 | 67 |
| 67 NativeWidget* CreateNativeWidgetMus( | 68 NativeWidget* CreateNativeWidgetMus( |
| 68 const std::map<std::string, std::vector<uint8_t>>& properties, | 69 const std::map<std::string, std::vector<uint8_t>>& properties, |
| 69 const Widget::InitParams& init_params, | 70 const Widget::InitParams& init_params, |
| 70 internal::NativeWidgetDelegate* delegate); | 71 internal::NativeWidgetDelegate* delegate); |
| 71 | 72 |
| 72 void AddPointerWatcher(PointerWatcher* watcher); | 73 void AddPointerWatcher(PointerWatcher* watcher); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 // Must be empty on destruction. | 105 // Must be empty on destruction. |
| 105 base::ObserverList<PointerWatcher, true> pointer_watchers_; | 106 base::ObserverList<PointerWatcher, true> pointer_watchers_; |
| 106 base::ObserverList<TouchEventWatcher, true> touch_event_watchers_; | 107 base::ObserverList<TouchEventWatcher, true> touch_event_watchers_; |
| 107 | 108 |
| 108 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 109 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 109 }; | 110 }; |
| 110 | 111 |
| 111 } // namespace views | 112 } // namespace views |
| 112 | 113 |
| 113 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 114 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |