| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/wayland/ozone_platform_wayland.h" | 5 #include "ui/ozone/platform/wayland/ozone_platform_wayland.h" |
| 6 | 6 |
| 7 #include "ui/ozone/common/native_display_delegate_ozone.h" | 7 #include "ui/ozone/common/native_display_delegate_ozone.h" |
| 8 #include "ui/ozone/common/stub_overlay_manager.h" | 8 #include "ui/ozone/common/stub_overlay_manager.h" |
| 9 #include "ui/ozone/platform/wayland/wayland_display.h" | 9 #include "ui/ozone/platform/wayland/wayland_display.h" |
| 10 #include "ui/ozone/platform/wayland/wayland_surface_factory.h" | 10 #include "ui/ozone/platform/wayland/wayland_surface_factory.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 make_scoped_ptr(new WaylandWindow(delegate, display_.get(), bounds)); | 61 make_scoped_ptr(new WaylandWindow(delegate, display_.get(), bounds)); |
| 62 if (!window->Initialize()) | 62 if (!window->Initialize()) |
| 63 return nullptr; | 63 return nullptr; |
| 64 return std::move(window); | 64 return std::move(window); |
| 65 } | 65 } |
| 66 | 66 |
| 67 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 67 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { |
| 68 return make_scoped_ptr(new NativeDisplayDelegateOzone); | 68 return make_scoped_ptr(new NativeDisplayDelegateOzone); |
| 69 } | 69 } |
| 70 | 70 |
| 71 base::ScopedFD OpenClientNativePixmapDevice() const override { | |
| 72 NOTIMPLEMENTED(); | |
| 73 return base::ScopedFD(); | |
| 74 } | |
| 75 | |
| 76 void InitializeUI() override { | 71 void InitializeUI() override { |
| 77 display_.reset(new WaylandDisplay); | 72 display_.reset(new WaylandDisplay); |
| 78 if (!display_->Initialize()) | 73 if (!display_->Initialize()) |
| 79 LOG(FATAL) << "Failed to initialize Wayland platform"; | 74 LOG(FATAL) << "Failed to initialize Wayland platform"; |
| 80 | 75 |
| 81 cursor_factory_.reset(new CursorFactoryOzone); | 76 cursor_factory_.reset(new CursorFactoryOzone); |
| 82 overlay_manager_.reset(new StubOverlayManager); | 77 overlay_manager_.reset(new StubOverlayManager); |
| 83 input_controller_ = CreateStubInputController(); | 78 input_controller_ = CreateStubInputController(); |
| 84 surface_factory_.reset(new WaylandSurfaceFactory(display_.get())); | 79 surface_factory_.reset(new WaylandSurfaceFactory(display_.get())); |
| 85 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); | 80 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 105 DISALLOW_COPY_AND_ASSIGN(OzonePlatformWayland); | 100 DISALLOW_COPY_AND_ASSIGN(OzonePlatformWayland); |
| 106 }; | 101 }; |
| 107 | 102 |
| 108 } // namespace | 103 } // namespace |
| 109 | 104 |
| 110 OzonePlatform* CreateOzonePlatformWayland() { | 105 OzonePlatform* CreateOzonePlatformWayland() { |
| 111 return new OzonePlatformWayland; | 106 return new OzonePlatformWayland; |
| 112 } | 107 } |
| 113 | 108 |
| 114 } // namespace ui | 109 } // namespace ui |
| OLD | NEW |