| 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/drm/ozone_platform_drm.h" | 5 #include "ui/ozone/platform/drm/ozone_platform_drm.h" |
| 6 | 6 |
| 7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
| 8 #include "base/thread_task_runner_handle.h" | 8 #include "base/thread_task_runner_handle.h" |
| 9 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" | 9 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" |
| 10 #include "ui/events/ozone/device/device_manager.h" | 10 #include "ui/events/ozone/device/device_manager.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(), | 83 new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(), |
| 84 event_factory_ozone_.get(), cursor_.get(), | 84 event_factory_ozone_.get(), cursor_.get(), |
| 85 window_manager_.get(), display_manager_.get())); | 85 window_manager_.get(), display_manager_.get())); |
| 86 platform_window->Initialize(); | 86 platform_window->Initialize(); |
| 87 return platform_window.Pass(); | 87 return platform_window.Pass(); |
| 88 } | 88 } |
| 89 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 89 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { |
| 90 return make_scoped_ptr( | 90 return make_scoped_ptr( |
| 91 new DrmNativeDisplayDelegate(display_manager_.get())); | 91 new DrmNativeDisplayDelegate(display_manager_.get())); |
| 92 } | 92 } |
| 93 base::ScopedFD OpenClientNativePixmapDevice() const override { |
| 94 return base::ScopedFD(); |
| 95 } |
| 93 void InitializeUI() override { | 96 void InitializeUI() override { |
| 94 drm_device_manager_.reset(new DrmDeviceManager( | 97 drm_device_manager_.reset(new DrmDeviceManager( |
| 95 scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator()))); | 98 scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator()))); |
| 96 window_manager_.reset(new DrmWindowHostManager()); | 99 window_manager_.reset(new DrmWindowHostManager()); |
| 97 cursor_.reset(new DrmCursor(window_manager_.get())); | 100 cursor_.reset(new DrmCursor(window_manager_.get())); |
| 98 #if defined(USE_XKBCOMMON) | 101 #if defined(USE_XKBCOMMON) |
| 99 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr( | 102 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr( |
| 100 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_))); | 103 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_))); |
| 101 #else | 104 #else |
| 102 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( | 105 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 162 |
| 160 OzonePlatform* CreateOzonePlatformDri() { | 163 OzonePlatform* CreateOzonePlatformDri() { |
| 161 return new OzonePlatformDrm; | 164 return new OzonePlatformDrm; |
| 162 } | 165 } |
| 163 | 166 |
| 164 OzonePlatform* CreateOzonePlatformDrm() { | 167 OzonePlatform* CreateOzonePlatformDrm() { |
| 165 return new OzonePlatformDrm; | 168 return new OzonePlatformDrm; |
| 166 } | 169 } |
| 167 | 170 |
| 168 } // namespace ui | 171 } // namespace ui |
| OLD | NEW |