| 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/x11/ozone_platform_x11.h" | 5 #include "ui/ozone/platform/x11/ozone_platform_x11.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "ui/events/platform/x11/x11_event_source_libevent.h" | 10 #include "ui/events/platform/x11/x11_event_source_libevent.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 make_scoped_ptr(new X11WindowOzone(event_source_.get(), delegate)); | 66 make_scoped_ptr(new X11WindowOzone(event_source_.get(), delegate)); |
| 67 window->SetBounds(bounds); | 67 window->SetBounds(bounds); |
| 68 window->Create(); | 68 window->Create(); |
| 69 return std::move(window); | 69 return std::move(window); |
| 70 } | 70 } |
| 71 | 71 |
| 72 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 72 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { |
| 73 return make_scoped_ptr(new NativeDisplayDelegateOzone()); | 73 return make_scoped_ptr(new NativeDisplayDelegateOzone()); |
| 74 } | 74 } |
| 75 | 75 |
| 76 base::ScopedFD OpenClientNativePixmapDevice() const override { | |
| 77 return base::ScopedFD(); | |
| 78 } | |
| 79 | |
| 80 void InitializeUI() override { | 76 void InitializeUI() override { |
| 81 event_source_.reset(new X11EventSourceLibevent(gfx::GetXDisplay())); | 77 event_source_.reset(new X11EventSourceLibevent(gfx::GetXDisplay())); |
| 82 surface_factory_ozone_.reset(new X11SurfaceFactory()); | 78 surface_factory_ozone_.reset(new X11SurfaceFactory()); |
| 83 overlay_manager_.reset(new StubOverlayManager()); | 79 overlay_manager_.reset(new StubOverlayManager()); |
| 84 input_controller_ = CreateStubInputController(); | 80 input_controller_ = CreateStubInputController(); |
| 85 cursor_factory_ozone_.reset(new X11CursorFactoryOzone()); | 81 cursor_factory_ozone_.reset(new X11CursorFactoryOzone()); |
| 86 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); | 82 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); |
| 87 } | 83 } |
| 88 | 84 |
| 89 void InitializeGPU() override { | 85 void InitializeGPU() override { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 108 DISALLOW_COPY_AND_ASSIGN(OzonePlatformX11); | 104 DISALLOW_COPY_AND_ASSIGN(OzonePlatformX11); |
| 109 }; | 105 }; |
| 110 | 106 |
| 111 } // namespace | 107 } // namespace |
| 112 | 108 |
| 113 OzonePlatform* CreateOzonePlatformX11() { | 109 OzonePlatform* CreateOzonePlatformX11() { |
| 114 return new OzonePlatformX11; | 110 return new OzonePlatformX11; |
| 115 } | 111 } |
| 116 | 112 |
| 117 } // namespace ui | 113 } // namespace ui |
| OLD | NEW |