| Index: ui/ozone/public/native_pixmap_manager.h
|
| diff --git a/ui/ozone/public/native_pixmap_manager.h b/ui/ozone/public/native_pixmap_manager.h
|
| index b6afdad6a9af95dd364053560c740f5795886dc4..fbbb106b61205066fac6446e55efa3a9688642d9 100644
|
| --- a/ui/ozone/public/native_pixmap_manager.h
|
| +++ b/ui/ozone/public/native_pixmap_manager.h
|
| @@ -10,6 +10,12 @@
|
| #include "ui/ozone/ozone_export.h"
|
| #include "ui/ozone/public/surface_factory_ozone.h"
|
|
|
| +namespace base {
|
| +
|
| +struct FileDescriptor;
|
| +
|
| +} // namespace base
|
| +
|
| namespace ui {
|
|
|
| // The Ozone interface allows external implementations to hook into Chromium to
|
| @@ -17,9 +23,10 @@ namespace ui {
|
| class OZONE_EXPORT NativePixmapManager {
|
| public:
|
| static NativePixmapManager* GetInstance();
|
| - static void SetInstance(scoped_ptr<NativePixmapManager> instance);
|
| + static void SetInstance(NativePixmapManager* instance);
|
|
|
| - static scoped_ptr<NativePixmapManager> Create();
|
| + static scoped_ptr<NativePixmapManager> Create(
|
| + const base::FileDescriptor& device_fd);
|
|
|
| virtual ~NativePixmapManager();
|
|
|
| @@ -35,6 +42,8 @@ class OZONE_EXPORT NativePixmapManager {
|
| protected:
|
| NativePixmapManager();
|
|
|
| + virtual void Initialize(const base::FileDescriptor& device_fd) = 0;
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(NativePixmapManager);
|
| };
|
|
|