| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 const std::map<std::string, std::vector<uint8_t>>& properties); | 60 const std::map<std::string, std::vector<uint8_t>>& properties); |
| 61 | 61 |
| 62 NativeWidget* CreateNativeWidgetMus( | 62 NativeWidget* CreateNativeWidgetMus( |
| 63 const std::map<std::string, std::vector<uint8_t>>& properties, | 63 const std::map<std::string, std::vector<uint8_t>>& properties, |
| 64 const Widget::InitParams& init_params, | 64 const Widget::InitParams& init_params, |
| 65 internal::NativeWidgetDelegate* delegate); | 65 internal::NativeWidgetDelegate* delegate); |
| 66 | 66 |
| 67 void AddPointerWatcher(PointerWatcher* watcher); | 67 void AddPointerWatcher(PointerWatcher* watcher); |
| 68 void RemovePointerWatcher(PointerWatcher* watcher); | 68 void RemovePointerWatcher(PointerWatcher* watcher); |
| 69 | 69 |
| 70 const std::set<ui::Window*>& GetRoots() const; |
| 71 |
| 70 private: | 72 private: |
| 71 friend class WindowManagerConnectionTest; | 73 friend class WindowManagerConnectionTest; |
| 72 | 74 |
| 73 WindowManagerConnection(shell::Connector* connector, | 75 WindowManagerConnection(shell::Connector* connector, |
| 74 const shell::Identity& identity); | 76 const shell::Identity& identity); |
| 75 | 77 |
| 76 // Returns true if there is one or more pointer watchers for this client. | 78 // Returns true if there is one or more pointer watchers for this client. |
| 77 bool HasPointerWatcher(); | 79 bool HasPointerWatcher(); |
| 78 | 80 |
| 79 // ui::WindowTreeClientDelegate: | 81 // ui::WindowTreeClientDelegate: |
| (...skipping 11 matching lines...) Expand all Loading... |
| 91 std::unique_ptr<ui::WindowTreeClient> client_; | 93 std::unique_ptr<ui::WindowTreeClient> client_; |
| 92 // Must be empty on destruction. | 94 // Must be empty on destruction. |
| 93 base::ObserverList<PointerWatcher, true> pointer_watchers_; | 95 base::ObserverList<PointerWatcher, true> pointer_watchers_; |
| 94 | 96 |
| 95 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 97 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 96 }; | 98 }; |
| 97 | 99 |
| 98 } // namespace views | 100 } // namespace views |
| 99 | 101 |
| 100 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 102 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |