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_EXO_DISPLAY_H_ | 5 #ifndef COMPONENTS_EXO_DISPLAY_H_ |
6 #define COMPONENTS_EXO_DISPLAY_H_ | 6 #define COMPONENTS_EXO_DISPLAY_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include <stddef.h> |
| 9 |
| 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
10 #include "base/memory/shared_memory_handle.h" | 12 #include "base/memory/shared_memory_handle.h" |
11 | 13 |
12 #if defined(USE_OZONE) | 14 #if defined(USE_OZONE) |
13 #include "base/files/scoped_file.h" | 15 #include "base/files/scoped_file.h" |
14 #include "ui/gfx/buffer_types.h" | 16 #include "ui/gfx/buffer_types.h" |
15 #include "ui/gfx/geometry/size.h" | 17 #include "ui/gfx/geometry/size.h" |
16 #endif | 18 #endif |
17 | 19 |
18 namespace exo { | 20 namespace exo { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 // a child of |parent|. | 59 // a child of |parent|. |
58 scoped_ptr<SubSurface> CreateSubSurface(Surface* surface, Surface* parent); | 60 scoped_ptr<SubSurface> CreateSubSurface(Surface* surface, Surface* parent); |
59 | 61 |
60 private: | 62 private: |
61 DISALLOW_COPY_AND_ASSIGN(Display); | 63 DISALLOW_COPY_AND_ASSIGN(Display); |
62 }; | 64 }; |
63 | 65 |
64 } // namespace exo | 66 } // namespace exo |
65 | 67 |
66 #endif // COMPONENTS_EXO_DISPLAY_H_ | 68 #endif // COMPONENTS_EXO_DISPLAY_H_ |
OLD | NEW |