| 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/base/cursor/ozone/bitmap_cursor_factory_ozone.h" | 8 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" |
| 9 #include "ui/events/ozone/device/device_manager.h" | 9 #include "ui/events/ozone/device/device_manager.h" |
| 10 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" | 10 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 } | 54 } |
| 55 CursorFactoryOzone* GetCursorFactoryOzone() override { | 55 CursorFactoryOzone* GetCursorFactoryOzone() override { |
| 56 return cursor_factory_ozone_.get(); | 56 return cursor_factory_ozone_.get(); |
| 57 } | 57 } |
| 58 GpuPlatformSupport* GetGpuPlatformSupport() override { | 58 GpuPlatformSupport* GetGpuPlatformSupport() override { |
| 59 return gpu_platform_support_.get(); | 59 return gpu_platform_support_.get(); |
| 60 } | 60 } |
| 61 GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { | 61 GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { |
| 62 return gpu_platform_support_host_.get(); | 62 return gpu_platform_support_host_.get(); |
| 63 } | 63 } |
| 64 scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override { |
| 65 return event_factory_ozone_->CreateSystemInputInjector(); |
| 66 } |
| 64 scoped_ptr<PlatformWindow> CreatePlatformWindow( | 67 scoped_ptr<PlatformWindow> CreatePlatformWindow( |
| 65 PlatformWindowDelegate* delegate, | 68 PlatformWindowDelegate* delegate, |
| 66 const gfx::Rect& bounds) override { | 69 const gfx::Rect& bounds) override { |
| 67 scoped_ptr<DriWindow> platform_window( | 70 scoped_ptr<DriWindow> platform_window( |
| 68 new DriWindow(delegate, bounds, gpu_platform_support_host_.get(), | 71 new DriWindow(delegate, bounds, gpu_platform_support_host_.get(), |
| 69 event_factory_ozone_.get(), window_manager_.get(), | 72 event_factory_ozone_.get(), window_manager_.get(), |
| 70 display_manager_.get())); | 73 display_manager_.get())); |
| 71 platform_window->Initialize(); | 74 platform_window->Initialize(); |
| 72 return platform_window.Pass(); | 75 return platform_window.Pass(); |
| 73 } | 76 } |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 UiThreadGpu ui_thread_gpu_; | 125 UiThreadGpu ui_thread_gpu_; |
| 123 | 126 |
| 124 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); | 127 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); |
| 125 }; | 128 }; |
| 126 | 129 |
| 127 } // namespace | 130 } // namespace |
| 128 | 131 |
| 129 OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; } | 132 OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; } |
| 130 | 133 |
| 131 } // namespace ui | 134 } // namespace ui |
| OLD | NEW |