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_SERVER_VIEW_H_ | 5 #ifndef COMPONENTS_MUS_VM_SERVER_VIEW_H_ |
6 #define COMPONENTS_MUS_SERVER_VIEW_H_ | 6 #define COMPONENTS_MUS_VM_SERVER_VIEW_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/observer_list.h" | 11 #include "base/observer_list.h" |
12 #include "cc/surfaces/surface_factory.h" | 12 #include "cc/surfaces/surface_factory.h" |
13 #include "cc/surfaces/surface_factory_client.h" | 13 #include "cc/surfaces/surface_factory_client.h" |
14 #include "cc/surfaces/surface_id.h" | 14 #include "cc/surfaces/surface_id.h" |
15 #include "cc/surfaces/surface_id_allocator.h" | 15 #include "cc/surfaces/surface_id_allocator.h" |
16 #include "components/mus/ids.h" | |
17 #include "components/mus/public/interfaces/view_tree.mojom.h" | 16 #include "components/mus/public/interfaces/view_tree.mojom.h" |
| 17 #include "components/mus/vm/ids.h" |
18 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" | 18 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
19 #include "ui/gfx/geometry/rect.h" | 19 #include "ui/gfx/geometry/rect.h" |
20 #include "ui/gfx/transform.h" | 20 #include "ui/gfx/transform.h" |
21 #include "ui/platform_window/text_input_state.h" | 21 #include "ui/platform_window/text_input_state.h" |
22 | 22 |
23 namespace mus { | 23 namespace mus { |
24 | 24 |
25 class ServerViewDelegate; | 25 class ServerViewDelegate; |
26 class ServerViewObserver; | 26 class ServerViewObserver; |
27 | 27 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 145 |
146 base::ObserverList<ServerViewObserver> observers_; | 146 base::ObserverList<ServerViewObserver> observers_; |
147 mojo::SurfaceClientPtr client_; | 147 mojo::SurfaceClientPtr client_; |
148 mojo::Binding<Surface> binding_; | 148 mojo::Binding<Surface> binding_; |
149 | 149 |
150 DISALLOW_COPY_AND_ASSIGN(ServerView); | 150 DISALLOW_COPY_AND_ASSIGN(ServerView); |
151 }; | 151 }; |
152 | 152 |
153 } // namespace mus | 153 } // namespace mus |
154 | 154 |
155 #endif // COMPONENTS_MUS_SERVER_VIEW_H_ | 155 #endif // COMPONENTS_MUS_VM_SERVER_VIEW_H_ |
OLD | NEW |