| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "ui/ozone/platform/dri/ozone_platform_dri.h" | 5 #include "ui/ozone/platform/dri/ozone_platform_dri.h" |
| 6 | 6 |
| 7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
| 8 #include "ui/events/ozone/device/device_manager.h" | 8 #include "ui/events/ozone/device/device_manager.h" |
| 9 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" | 9 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" |
| 10 #include "ui/events/ozone/evdev/event_factory_evdev.h" | 10 #include "ui/events/ozone/evdev/event_factory_evdev.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 } | 58 } |
| 59 virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { | 59 virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { |
| 60 return NULL; // no GPU support | 60 return NULL; // no GPU support |
| 61 } | 61 } |
| 62 virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { | 62 virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { |
| 63 return NULL; // no GPU support | 63 return NULL; // no GPU support |
| 64 } | 64 } |
| 65 virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( | 65 virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( |
| 66 PlatformWindowDelegate* delegate, | 66 PlatformWindowDelegate* delegate, |
| 67 const gfx::Rect& bounds) OVERRIDE { | 67 const gfx::Rect& bounds) OVERRIDE { |
| 68 return scoped_ptr<PlatformWindow>(new DriWindow(delegate, bounds)); | 68 return scoped_ptr<PlatformWindow>( |
| 69 new DriWindow(delegate, bounds, surface_factory_ozone_.get())); |
| 69 } | 70 } |
| 70 #if defined(OS_CHROMEOS) | 71 #if defined(OS_CHROMEOS) |
| 71 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() | 72 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() |
| 72 OVERRIDE { | 73 OVERRIDE { |
| 73 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateDri( | 74 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateDri( |
| 74 dri_.get(), screen_manager_.get(), device_manager_.get())); | 75 dri_.get(), screen_manager_.get(), device_manager_.get())); |
| 75 } | 76 } |
| 76 virtual scoped_ptr<TouchscreenDeviceManager> | 77 virtual scoped_ptr<TouchscreenDeviceManager> |
| 77 CreateTouchscreenDeviceManager() OVERRIDE { | 78 CreateTouchscreenDeviceManager() OVERRIDE { |
| 78 return scoped_ptr<TouchscreenDeviceManager>( | 79 return scoped_ptr<TouchscreenDeviceManager>( |
| (...skipping 23 matching lines...) Expand all Loading... |
| 102 scoped_ptr<EventFactoryEvdev> event_factory_ozone_; | 103 scoped_ptr<EventFactoryEvdev> event_factory_ozone_; |
| 103 | 104 |
| 104 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); | 105 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); |
| 105 }; | 106 }; |
| 106 | 107 |
| 107 } // namespace | 108 } // namespace |
| 108 | 109 |
| 109 OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; } | 110 OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; } |
| 110 | 111 |
| 111 } // namespace ui | 112 } // namespace ui |
| OLD | NEW |