| 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 <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 } | 367 } |
| 368 scoped_ptr<PlatformWindow> CreatePlatformWindow( | 368 scoped_ptr<PlatformWindow> CreatePlatformWindow( |
| 369 PlatformWindowDelegate* delegate, | 369 PlatformWindowDelegate* delegate, |
| 370 const gfx::Rect& bounds) override { | 370 const gfx::Rect& bounds) override { |
| 371 return make_scoped_ptr<PlatformWindow>(new EgltestWindow( | 371 return make_scoped_ptr<PlatformWindow>(new EgltestWindow( |
| 372 delegate, &eglplatform_shim_, event_factory_ozone_.get(), bounds)); | 372 delegate, &eglplatform_shim_, event_factory_ozone_.get(), bounds)); |
| 373 } | 373 } |
| 374 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 374 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { |
| 375 return make_scoped_ptr(new NativeDisplayDelegateOzone()); | 375 return make_scoped_ptr(new NativeDisplayDelegateOzone()); |
| 376 } | 376 } |
| 377 base::ScopedFD OpenClientNativePixmapDevice() const override { | |
| 378 return base::ScopedFD(); | |
| 379 } | |
| 380 | 377 |
| 381 void InitializeUI() override { | 378 void InitializeUI() override { |
| 382 device_manager_ = CreateDeviceManager(); | 379 device_manager_ = CreateDeviceManager(); |
| 383 overlay_manager_.reset(new StubOverlayManager()); | 380 overlay_manager_.reset(new StubOverlayManager()); |
| 384 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( | 381 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( |
| 385 make_scoped_ptr(new StubKeyboardLayoutEngine())); | 382 make_scoped_ptr(new StubKeyboardLayoutEngine())); |
| 386 event_factory_ozone_.reset(new EventFactoryEvdev( | 383 event_factory_ozone_.reset(new EventFactoryEvdev( |
| 387 NULL, device_manager_.get(), | 384 NULL, device_manager_.get(), |
| 388 KeyboardLayoutEngineManager::GetKeyboardLayoutEngine())); | 385 KeyboardLayoutEngineManager::GetKeyboardLayoutEngine())); |
| 389 cursor_factory_ozone_.reset(new CursorFactoryOzone()); | 386 cursor_factory_ozone_.reset(new CursorFactoryOzone()); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 412 | 409 |
| 413 } // namespace | 410 } // namespace |
| 414 | 411 |
| 415 OzonePlatform* CreateOzonePlatformEgltest() { | 412 OzonePlatform* CreateOzonePlatformEgltest() { |
| 416 OzonePlatformEgltest* platform = new OzonePlatformEgltest; | 413 OzonePlatformEgltest* platform = new OzonePlatformEgltest; |
| 417 platform->Initialize(); | 414 platform->Initialize(); |
| 418 return platform; | 415 return platform; |
| 419 } | 416 } |
| 420 | 417 |
| 421 } // namespace ui | 418 } // namespace ui |
| OLD | NEW |