OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_SURFACES_SURFACES_STATE_H_ | 5 #ifndef COMPONENTS_MUS_SURFACES_SURFACES_STATE_H_ |
6 #define COMPONENTS_MUS_SURFACES_SURFACES_STATE_H_ | 6 #define COMPONENTS_MUS_SURFACES_SURFACES_STATE_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | |
danakj
2016/04/16 02:03:55
looks unused in this file
rjkroege
2016/04/16 02:17:28
Good point. Removed.
| |
11 | |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
12 #include "base/memory/scoped_ptr.h" | |
13 #include "cc/surfaces/surface_hittest.h" | 14 #include "cc/surfaces/surface_hittest.h" |
14 #include "cc/surfaces/surface_manager.h" | 15 #include "cc/surfaces/surface_manager.h" |
15 | 16 |
16 namespace cc { | 17 namespace cc { |
17 class SurfaceHittest; | 18 class SurfaceHittest; |
18 class SurfaceManager; | 19 class SurfaceManager; |
19 } // namespace cc | 20 } // namespace cc |
20 | 21 |
21 namespace mus { | 22 namespace mus { |
22 | 23 |
(...skipping 22 matching lines...) Expand all Loading... | |
45 uint32_t next_id_namespace_; | 46 uint32_t next_id_namespace_; |
46 cc::SurfaceManager manager_; | 47 cc::SurfaceManager manager_; |
47 cc::SurfaceHittest hit_tester_; | 48 cc::SurfaceHittest hit_tester_; |
48 | 49 |
49 DISALLOW_COPY_AND_ASSIGN(SurfacesState); | 50 DISALLOW_COPY_AND_ASSIGN(SurfacesState); |
50 }; | 51 }; |
51 | 52 |
52 } // namespace mus | 53 } // namespace mus |
53 | 54 |
54 #endif // COMPONENTS_MUS_SURFACES_SURFACES_STATE_H_ | 55 #endif // COMPONENTS_MUS_SURFACES_SURFACES_STATE_H_ |
OLD | NEW |