| 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 <memory> | 10 #include <memory> |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 // ScreenMusDelegate: | 80 // ScreenMusDelegate: |
| 81 void OnWindowManagerFrameValuesChanged() override; | 81 void OnWindowManagerFrameValuesChanged() override; |
| 82 gfx::Point GetCursorScreenPoint() override; | 82 gfx::Point GetCursorScreenPoint() override; |
| 83 | 83 |
| 84 shell::Connector* connector_; | 84 shell::Connector* connector_; |
| 85 shell::Identity identity_; | 85 shell::Identity identity_; |
| 86 std::unique_ptr<ScreenMus> screen_; | 86 std::unique_ptr<ScreenMus> screen_; |
| 87 std::unique_ptr<mus::WindowTreeClient> client_; | 87 std::unique_ptr<mus::WindowTreeClient> client_; |
| 88 // Must be empty on destruction. | 88 // Must be empty on destruction. |
| 89 base::ObserverList<PointerWatcher, true> pointer_watchers_; | 89 base::ObserverList<PointerWatcher, true> pointer_watchers_; |
| 90 bool created_device_data_manager_; |
| 90 | 91 |
| 91 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 92 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 92 }; | 93 }; |
| 93 | 94 |
| 94 } // namespace views | 95 } // namespace views |
| 95 | 96 |
| 96 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 97 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |