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 <memory> | 11 #include <memory> |
| 12 #include <string> |
| 13 #include <vector> |
11 | 14 |
12 #include "base/macros.h" | 15 #include "base/macros.h" |
13 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 #include "components/mus/public/cpp/input_devices/input_device_client.h" |
14 #include "components/mus/public/cpp/window_tree_client_delegate.h" | 18 #include "components/mus/public/cpp/window_tree_client_delegate.h" |
15 #include "services/shell/public/cpp/identity.h" | 19 #include "services/shell/public/cpp/identity.h" |
16 #include "ui/views/mus/mus_export.h" | 20 #include "ui/views/mus/mus_export.h" |
17 #include "ui/views/mus/screen_mus_delegate.h" | 21 #include "ui/views/mus/screen_mus_delegate.h" |
18 #include "ui/views/widget/widget.h" | 22 #include "ui/views/widget/widget.h" |
19 | 23 |
20 namespace shell { | 24 namespace shell { |
21 class Connector; | 25 class Connector; |
22 } | 26 } |
23 | 27 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 gfx::Point GetCursorScreenPoint() override; | 86 gfx::Point GetCursorScreenPoint() override; |
83 | 87 |
84 shell::Connector* connector_; | 88 shell::Connector* connector_; |
85 shell::Identity identity_; | 89 shell::Identity identity_; |
86 std::unique_ptr<ScreenMus> screen_; | 90 std::unique_ptr<ScreenMus> screen_; |
87 std::unique_ptr<mus::WindowTreeClient> client_; | 91 std::unique_ptr<mus::WindowTreeClient> client_; |
88 // Must be empty on destruction. | 92 // Must be empty on destruction. |
89 base::ObserverList<PointerWatcher, true> pointer_watchers_; | 93 base::ObserverList<PointerWatcher, true> pointer_watchers_; |
90 bool created_device_data_manager_; | 94 bool created_device_data_manager_; |
91 | 95 |
| 96 input_device::InputDeviceClient input_device_client_; |
| 97 |
92 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 98 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
93 }; | 99 }; |
94 | 100 |
95 } // namespace views | 101 } // namespace views |
96 | 102 |
97 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 103 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
OLD | NEW |