| 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 MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ | 5 #ifndef MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ |
| 6 #define MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ | 6 #define MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ |
| 7 | 7 |
| 8 #include "components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h" | 8 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h" |
| 9 #include "components/view_manager/gles2/raster_thread_helper.h" | 9 #include "components/mus/gles2/raster_thread_helper.h" |
| 10 #include "mandoline/ui/aura/surface_binding.h" | 10 #include "mandoline/ui/aura/surface_binding.h" |
| 11 #include "ui/compositor/compositor.h" | 11 #include "ui/compositor/compositor.h" |
| 12 | 12 |
| 13 namespace mojo { | 13 namespace mojo { |
| 14 class Shell; | 14 class Shell; |
| 15 class View; | 15 class View; |
| 16 } | 16 } |
| 17 | 17 |
| 18 namespace mandoline { | 18 namespace mandoline { |
| 19 | 19 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 45 uint32_t next_surface_id_namespace_; | 45 uint32_t next_surface_id_namespace_; |
| 46 gles2::RasterThreadHelper raster_thread_helper_; | 46 gles2::RasterThreadHelper raster_thread_helper_; |
| 47 gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_; | 47 gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_; |
| 48 | 48 |
| 49 DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory); | 49 DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory); |
| 50 }; | 50 }; |
| 51 | 51 |
| 52 } // namespace mandoline | 52 } // namespace mandoline |
| 53 | 53 |
| 54 #endif // MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ | 54 #endif // MANDOLINE_UI_AURA_SURFACE_CONTEXT_FACTORY_H_ |
| OLD | NEW |