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_DISPLAY_MANAGER_H_ | 5 #ifndef COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ |
6 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ | 6 #define COMPONENTS_MUS_WS_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/strings/string16.h" |
13 #include "base/timer/timer.h" | 14 #include "base/timer/timer.h" |
14 #include "components/mus/public/interfaces/window_tree.mojom.h" | 15 #include "components/mus/public/interfaces/window_tree.mojom.h" |
15 #include "components/mus/ws/display_manager_delegate.h" | 16 #include "components/mus/ws/display_manager_delegate.h" |
16 #include "mojo/public/cpp/bindings/callback.h" | 17 #include "mojo/public/cpp/bindings/callback.h" |
17 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
18 #include "ui/platform_window/platform_window_delegate.h" | 19 #include "ui/platform_window/platform_window_delegate.h" |
19 | 20 |
20 namespace cc { | 21 namespace cc { |
21 class CompositorFrame; | 22 class CompositorFrame; |
22 class SurfaceIdAllocator; | 23 class SurfaceIdAllocator; |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; | 153 base::WeakPtrFactory<DefaultDisplayManager> weak_factory_; |
153 | 154 |
154 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); | 155 DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager); |
155 }; | 156 }; |
156 | 157 |
157 } // namespace ws | 158 } // namespace ws |
158 | 159 |
159 } // namespace mus | 160 } // namespace mus |
160 | 161 |
161 #endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ | 162 #endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ |
OLD | NEW |