| 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_SURFACES_SURFACES_SCHEDULER_H_ |   5 #ifndef COMPONENTS_MUS_SURFACES_SURFACES_SCHEDULER_H_ | 
|   6 #define COMPONENTS_MUS_SURFACES_SURFACES_SCHEDULER_H_ |   6 #define COMPONENTS_MUS_SURFACES_SURFACES_SCHEDULER_H_ | 
|   7  |   7  | 
|   8 #include <set> |   8 #include <set> | 
|   9  |   9  | 
 |  10 #include "base/macros.h" | 
|  10 #include "cc/scheduler/scheduler.h" |  11 #include "cc/scheduler/scheduler.h" | 
|  11  |  12  | 
|  12 namespace cc { |  13 namespace cc { | 
|  13 class Display; |  14 class Display; | 
|  14 class RenderingStatsInstrumentation; |  15 class RenderingStatsInstrumentation; | 
|  15 } |  16 } | 
|  16  |  17  | 
|  17 namespace mus { |  18 namespace mus { | 
|  18  |  19  | 
|  19 // TODO(brianderson): Reconcile with DisplayScheduler crbug.com/476676 |  20 // TODO(brianderson): Reconcile with DisplayScheduler crbug.com/476676 | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
|  49   scoped_ptr<cc::Scheduler> scheduler_; |  50   scoped_ptr<cc::Scheduler> scheduler_; | 
|  50   scoped_ptr<cc::RenderingStatsInstrumentation> |  51   scoped_ptr<cc::RenderingStatsInstrumentation> | 
|  51       rendering_stats_instrumentation_; |  52       rendering_stats_instrumentation_; | 
|  52  |  53  | 
|  53   DISALLOW_COPY_AND_ASSIGN(SurfacesScheduler); |  54   DISALLOW_COPY_AND_ASSIGN(SurfacesScheduler); | 
|  54 }; |  55 }; | 
|  55  |  56  | 
|  56 }  // namespace mus |  57 }  // namespace mus | 
|  57  |  58  | 
|  58 #endif  // COMPONENTS_MUS_SURFACES_SURFACES_SCHEDULER_H_ |  59 #endif  // COMPONENTS_MUS_SURFACES_SURFACES_SCHEDULER_H_ | 
| OLD | NEW |