OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/egltest/ozone_platform_egltest.h" | 5 #include "ui/ozone/platform/egltest/ozone_platform_egltest.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/environment.h" | 8 #include "base/environment.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
11 #include "library_loaders/libeglplatform_shim.h" | 11 #include "library_loaders/libeglplatform_shim.h" |
12 #include "ui/events/ozone/device/device_manager.h" | 12 #include "ui/events/ozone/device/device_manager.h" |
13 #include "ui/events/ozone/evdev/event_factory_evdev.h" | 13 #include "ui/events/ozone/evdev/event_factory_evdev.h" |
14 #include "ui/gfx/vsync_provider.h" | 14 #include "ui/gfx/vsync_provider.h" |
| 15 #include "ui/ozone/common/window/platform_window_compat.h" |
15 #include "ui/ozone/public/cursor_factory_ozone.h" | 16 #include "ui/ozone/public/cursor_factory_ozone.h" |
16 #include "ui/ozone/public/gpu_platform_support.h" | 17 #include "ui/ozone/public/gpu_platform_support.h" |
17 #include "ui/ozone/public/gpu_platform_support_host.h" | 18 #include "ui/ozone/public/gpu_platform_support_host.h" |
18 #include "ui/ozone/public/ozone_platform.h" | 19 #include "ui/ozone/public/ozone_platform.h" |
19 #include "ui/ozone/public/ozone_switches.h" | 20 #include "ui/ozone/public/ozone_switches.h" |
20 #include "ui/ozone/public/surface_factory_ozone.h" | 21 #include "ui/ozone/public/surface_factory_ozone.h" |
21 #include "ui/ozone/public/surface_ozone_egl.h" | 22 #include "ui/ozone/public/surface_ozone_egl.h" |
22 | 23 |
23 #if defined(OS_CHROMEOS) | 24 #if defined(OS_CHROMEOS) |
24 #include "ui/ozone/common/chromeos/native_display_delegate_ozone.h" | 25 #include "ui/ozone/common/chromeos/native_display_delegate_ozone.h" |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 } | 254 } |
254 virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { | 255 virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE { |
255 return cursor_factory_ozone_.get(); | 256 return cursor_factory_ozone_.get(); |
256 } | 257 } |
257 virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { | 258 virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE { |
258 return gpu_platform_support_.get(); | 259 return gpu_platform_support_.get(); |
259 } | 260 } |
260 virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { | 261 virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE { |
261 return gpu_platform_support_host_.get(); | 262 return gpu_platform_support_host_.get(); |
262 } | 263 } |
| 264 virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( |
| 265 PlatformWindowDelegate* delegate, |
| 266 const gfx::Rect& bounds) OVERRIDE { |
| 267 return make_scoped_ptr<PlatformWindow>( |
| 268 new PlatformWindowCompat(delegate, bounds)); |
| 269 } |
263 | 270 |
264 #if defined(OS_CHROMEOS) | 271 #if defined(OS_CHROMEOS) |
265 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() | 272 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() |
266 OVERRIDE { | 273 OVERRIDE { |
267 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); | 274 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); |
268 } | 275 } |
269 virtual scoped_ptr<TouchscreenDeviceManager> | 276 virtual scoped_ptr<TouchscreenDeviceManager> |
270 CreateTouchscreenDeviceManager() OVERRIDE { | 277 CreateTouchscreenDeviceManager() OVERRIDE { |
271 return scoped_ptr<TouchscreenDeviceManager>( | 278 return scoped_ptr<TouchscreenDeviceManager>( |
272 new TouchscreenDeviceManagerOzone()); | 279 new TouchscreenDeviceManagerOzone()); |
(...skipping 30 matching lines...) Expand all Loading... |
303 | 310 |
304 } // namespace | 311 } // namespace |
305 | 312 |
306 OzonePlatform* CreateOzonePlatformEgltest() { | 313 OzonePlatform* CreateOzonePlatformEgltest() { |
307 OzonePlatformEgltest* platform = new OzonePlatformEgltest; | 314 OzonePlatformEgltest* platform = new OzonePlatformEgltest; |
308 platform->Initialize(); | 315 platform->Initialize(); |
309 return platform; | 316 return platform; |
310 } | 317 } |
311 | 318 |
312 } // namespace ui | 319 } // namespace ui |
OLD | NEW |