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_DISPLAY_MANAGER_H_ | 5 #ifndef COMPONENTS_MUS_VM_DISPLAY_MANAGER_H_ |
6 #define COMPONENTS_MUS_DISPLAY_MANAGER_H_ | 6 #define COMPONENTS_MUS_VM_DISPLAY_MANAGER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
13 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
14 #include "components/mus/display_manager_delegate.h" | |
15 #include "components/mus/public/interfaces/view_tree.mojom.h" | 14 #include "components/mus/public/interfaces/view_tree.mojom.h" |
16 #include "components/mus/surfaces/top_level_display_client.h" | 15 #include "components/mus/surfaces/top_level_display_client.h" |
| 16 #include "components/mus/vm/display_manager_delegate.h" |
17 #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" | 17 #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" |
18 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
19 #include "ui/platform_window/platform_window_delegate.h" | 19 #include "ui/platform_window/platform_window_delegate.h" |
20 | 20 |
21 namespace cc { | 21 namespace cc { |
22 class SurfaceIdAllocator; | 22 class SurfaceIdAllocator; |
23 class SurfaceManager; | 23 class SurfaceManager; |
24 } // namespace cc | 24 } // namespace cc |
25 | 25 |
26 namespace gles2 { | 26 namespace gles2 { |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 scoped_ptr<TopLevelDisplayClient> top_level_display_client_; | 139 scoped_ptr<TopLevelDisplayClient> top_level_display_client_; |
140 scoped_ptr<ui::PlatformWindow> platform_window_; | 140 scoped_ptr<ui::PlatformWindow> platform_window_; |
141 | 141 |
142 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; | 142 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; |
143 | 143 |
144 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); | 144 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); |
145 }; | 145 }; |
146 | 146 |
147 } // namespace mus | 147 } // namespace mus |
148 | 148 |
149 #endif // COMPONENTS_MUS_DISPLAY_MANAGER_H_ | 149 #endif // COMPONENTS_MUS_VM_DISPLAY_MANAGER_H_ |
OLD | NEW |