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_MUS_APP_H_ | 5 #ifndef COMPONENTS_MUS_MUS_APP_H_ |
6 #define COMPONENTS_MUS_MUS_APP_H_ | 6 #define COMPONENTS_MUS_MUS_APP_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 mojom::WindowTreeClientPtr tree_client, | 84 mojom::WindowTreeClientPtr tree_client, |
85 mojom::WindowManagerPtr window_manager) override; | 85 mojom::WindowManagerPtr window_manager) override; |
86 | 86 |
87 mojo::WeakBindingSet<mojom::WindowTreeHostFactory> factory_bindings_; | 87 mojo::WeakBindingSet<mojom::WindowTreeHostFactory> factory_bindings_; |
88 scoped_ptr<ws::ForwardingWindowManager> window_manager_impl_; | 88 scoped_ptr<ws::ForwardingWindowManager> window_manager_impl_; |
89 mojo::WeakBindingSet<mojom::WindowManager> window_manager_bindings_; | 89 mojo::WeakBindingSet<mojom::WindowManager> window_manager_bindings_; |
90 mojo::ApplicationImpl* app_impl_; | 90 mojo::ApplicationImpl* app_impl_; |
91 scoped_ptr<ws::ConnectionManager> connection_manager_; | 91 scoped_ptr<ws::ConnectionManager> connection_manager_; |
92 scoped_refptr<GpuState> gpu_state_; | 92 scoped_refptr<GpuState> gpu_state_; |
93 scoped_ptr<ui::PlatformEventSource> event_source_; | 93 scoped_ptr<ui::PlatformEventSource> event_source_; |
| 94 mojo::TracingImpl tracing_; |
94 using WindowManagerRequests = | 95 using WindowManagerRequests = |
95 std::vector<scoped_ptr<mojo::InterfaceRequest<mojom::WindowManager>>>; | 96 std::vector<scoped_ptr<mojo::InterfaceRequest<mojom::WindowManager>>>; |
96 WindowManagerRequests pending_window_manager_requests_; | 97 WindowManagerRequests pending_window_manager_requests_; |
97 | 98 |
98 // Surfaces | 99 // Surfaces |
99 scoped_refptr<SurfacesState> surfaces_state_; | 100 scoped_refptr<SurfacesState> surfaces_state_; |
100 | 101 |
101 DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp); | 102 DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp); |
102 }; | 103 }; |
103 | 104 |
104 } // namespace mus | 105 } // namespace mus |
105 | 106 |
106 #endif // COMPONENTS_MUS_MUS_APP_H_ | 107 #endif // COMPONENTS_MUS_MUS_APP_H_ |
OLD | NEW |