OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ | 5 #ifndef SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_ |
6 #define COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ | 6 #define SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "components/mus/common/types.h" | |
15 #include "components/mus/public/interfaces/window_tree.mojom.h" | |
16 #include "mojo/public/cpp/bindings/array.h" | 14 #include "mojo/public/cpp/bindings/array.h" |
| 15 #include "services/ui/common/types.h" |
| 16 #include "services/ui/public/interfaces/window_tree.mojom.h" |
17 #include "ui/gfx/geometry/mojo/geometry.mojom.h" | 17 #include "ui/gfx/geometry/mojo/geometry.mojom.h" |
18 | 18 |
19 namespace mus { | 19 namespace mus { |
20 | 20 |
21 namespace ws { | 21 namespace ws { |
22 | 22 |
23 enum ChangeType { | 23 enum ChangeType { |
24 CHANGE_TYPE_EMBED, | 24 CHANGE_TYPE_EMBED, |
25 CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED, | 25 CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED, |
26 CHANGE_TYPE_UNEMBED, | 26 CHANGE_TYPE_UNEMBED, |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 Delegate* delegate_; | 175 Delegate* delegate_; |
176 std::vector<Change> changes_; | 176 std::vector<Change> changes_; |
177 | 177 |
178 DISALLOW_COPY_AND_ASSIGN(TestChangeTracker); | 178 DISALLOW_COPY_AND_ASSIGN(TestChangeTracker); |
179 }; | 179 }; |
180 | 180 |
181 } // namespace ws | 181 } // namespace ws |
182 | 182 |
183 } // namespace mus | 183 } // namespace mus |
184 | 184 |
185 #endif // COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ | 185 #endif // SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_ |
OLD | NEW |