| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_PORT_MUS_H_ | 5 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_ |
| 6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_ | 6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 void OnPropertyChanged(const void* key, | 231 void OnPropertyChanged(const void* key, |
| 232 std::unique_ptr<WindowPortPropertyData> data) override; | 232 std::unique_ptr<WindowPortPropertyData> data) override; |
| 233 | 233 |
| 234 WindowTreeClient* window_tree_client_; | 234 WindowTreeClient* window_tree_client_; |
| 235 | 235 |
| 236 Window* window_ = nullptr; | 236 Window* window_ = nullptr; |
| 237 | 237 |
| 238 ServerChangeIdType next_server_change_id_ = 0; | 238 ServerChangeIdType next_server_change_id_ = 0; |
| 239 ServerChanges server_changes_; | 239 ServerChanges server_changes_; |
| 240 | 240 |
| 241 SurfaceIdHandler* surface_id_handler_; | 241 SurfaceIdHandler* surface_id_handler_ = nullptr; |
| 242 std::unique_ptr<SurfaceInfo> surface_info_; | 242 std::unique_ptr<SurfaceInfo> surface_info_; |
| 243 | 243 |
| 244 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; | 244 ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL; |
| 245 | 245 |
| 246 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); | 246 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); |
| 247 }; | 247 }; |
| 248 | 248 |
| 249 } // namespace aura | 249 } // namespace aura |
| 250 | 250 |
| 251 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ | 251 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ |
| OLD | NEW |