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> |
11 #include <memory> | 11 #include <memory> |
12 #include <string> | 12 #include <string> |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
17 #include "components/mus/public/cpp/window_tree_client_delegate.h" | |
18 #include "services/shell/public/cpp/identity.h" | 17 #include "services/shell/public/cpp/identity.h" |
| 18 #include "services/ui/public/cpp/window_tree_client_delegate.h" |
19 #include "ui/views/mus/mus_export.h" | 19 #include "ui/views/mus/mus_export.h" |
20 #include "ui/views/mus/screen_mus_delegate.h" | 20 #include "ui/views/mus/screen_mus_delegate.h" |
21 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
22 | 22 |
23 namespace shell { | 23 namespace shell { |
24 class Connector; | 24 class Connector; |
25 } | 25 } |
26 | 26 |
27 namespace views { | 27 namespace views { |
28 class ClipboardMus; | 28 class ClipboardMus; |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 std::unique_ptr<mus::WindowTreeClient> client_; | 91 std::unique_ptr<mus::WindowTreeClient> client_; |
92 // Must be empty on destruction. | 92 // Must be empty on destruction. |
93 base::ObserverList<PointerWatcher, true> pointer_watchers_; | 93 base::ObserverList<PointerWatcher, true> pointer_watchers_; |
94 | 94 |
95 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 95 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
96 }; | 96 }; |
97 | 97 |
98 } // namespace views | 98 } // namespace views |
99 | 99 |
100 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 100 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
OLD | NEW |