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