| 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 CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/output/software_output_device.h" | 10 #include "cc/output/software_output_device.h" |
| 10 #include "content/common/content_export.h" | 11 #include "content/common/content_export.h" |
| 11 #include "ui/gfx/native_widget_types.h" | 12 #include "ui/gfx/native_widget_types.h" |
| 12 | 13 |
| 13 namespace ui { | 14 namespace ui { |
| 14 class Compositor; | 15 class Compositor; |
| 15 class SurfaceOzoneCanvas; | 16 class SurfaceOzoneCanvas; |
| 16 } | 17 } |
| 17 | 18 |
| 18 namespace content { | 19 namespace content { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 37 ui::Compositor* compositor_; | 38 ui::Compositor* compositor_; |
| 38 | 39 |
| 39 scoped_ptr<ui::SurfaceOzoneCanvas> surface_ozone_; | 40 scoped_ptr<ui::SurfaceOzoneCanvas> surface_ozone_; |
| 40 | 41 |
| 41 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone); | 42 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone); |
| 42 }; | 43 }; |
| 43 | 44 |
| 44 } // namespace content | 45 } // namespace content |
| 45 | 46 |
| 46 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ | 47 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ |
| OLD | NEW |