| OLD | NEW |
| 1 // Copyright 2013 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_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ |
| 6 #define CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ |
| 7 | 7 |
| 8 #include "cc/output/software_output_device.h" | 8 #include "cc/output/software_output_device.h" |
| 9 #include "content/common/content_export.h" | 9 #include "content/common/content_export.h" |
| 10 #include "ui/gfx/native_widget_types.h" | 10 #include "ui/gfx/native_widget_types.h" |
| 11 | 11 |
| 12 namespace ui { | 12 namespace ui { |
| 13 class Compositor; | 13 class Compositor; |
| 14 } | 14 } |
| 15 | 15 |
| 16 namespace content { | 16 namespace content { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 31 private: | 31 private: |
| 32 ui::Compositor* compositor_; | 32 ui::Compositor* compositor_; |
| 33 | 33 |
| 34 gfx::AcceleratedWidget realized_widget_; | 34 gfx::AcceleratedWidget realized_widget_; |
| 35 | 35 |
| 36 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone); | 36 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone); |
| 37 }; | 37 }; |
| 38 | 38 |
| 39 } // namespace content | 39 } // namespace content |
| 40 | 40 |
| 41 #endif // CONTENT_BROWSER_AURA_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ | 41 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ |
| OLD | NEW |