| 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> |
| 9 |
| 10 #include "base/macros.h" |
| 8 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 10 #include "cc/surfaces/surface_hittest.h" | 13 #include "cc/surfaces/surface_hittest.h" |
| 11 #include "cc/surfaces/surface_manager.h" | 14 #include "cc/surfaces/surface_manager.h" |
| 12 #include "components/mus/surfaces/surfaces_scheduler.h" | 15 #include "components/mus/surfaces/surfaces_scheduler.h" |
| 13 | 16 |
| 14 namespace cc { | 17 namespace cc { |
| 15 class SurfaceHittest; | 18 class SurfaceHittest; |
| 16 class SurfaceManager; | 19 class SurfaceManager; |
| 17 } // namespace cc | 20 } // namespace cc |
| (...skipping 28 matching lines...) Expand all Loading... |
| 46 cc::SurfaceManager manager_; | 49 cc::SurfaceManager manager_; |
| 47 cc::SurfaceHittest hit_tester_; | 50 cc::SurfaceHittest hit_tester_; |
| 48 SurfacesScheduler scheduler_; | 51 SurfacesScheduler scheduler_; |
| 49 | 52 |
| 50 DISALLOW_COPY_AND_ASSIGN(SurfacesState); | 53 DISALLOW_COPY_AND_ASSIGN(SurfacesState); |
| 51 }; | 54 }; |
| 52 | 55 |
| 53 } // namespace mus | 56 } // namespace mus |
| 54 | 57 |
| 55 #endif // COMPONENTS_MUS_SURFACES_SURFACES_STATE_H_ | 58 #endif // COMPONENTS_MUS_SURFACES_SURFACES_STATE_H_ |
| OLD | NEW |