Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(972)

Unified Diff: ui/ozone/platform/egltest/ozone_platform_egltest.cc

Issue 742103002: Ozone keyboard layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lite-code
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/egltest/ozone_platform_egltest.cc
diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
index 08aa8ab75b7ffe7794fc88cdc31623fec9773d4a..e42793130898ab501995c475083abe71ab57d904 100644
--- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc
+++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
@@ -14,6 +14,7 @@
#include "ui/events/ozone/device/device_manager.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
#include "ui/events/ozone/events_ozone.h"
+#include "ui/events/ozone/layout/stub/stub_keyboard_layouts.h"
#include "ui/events/platform/platform_event_dispatcher.h"
#include "ui/gfx/vsync_provider.h"
#include "ui/ozone/common/native_display_delegate_ozone.h"
@@ -327,6 +328,9 @@ class OzonePlatformEgltest : public OzonePlatform {
GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
return gpu_platform_support_host_.get();
}
+ KeyboardLayoutsOzone* GetKeyboardLayouts() override {
+ return keyboard_layouts_ozone_.get();
+ }
scoped_ptr<PlatformWindow> CreatePlatformWindow(
PlatformWindowDelegate* delegate,
const gfx::Rect& bounds) override {
@@ -349,6 +353,7 @@ class OzonePlatformEgltest : public OzonePlatform {
new EventFactoryEvdev(NULL, device_manager_.get()));
cursor_factory_ozone_.reset(new CursorFactoryOzone());
gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
+ keyboard_layouts_ozone_.reset(new StubKeyboardLayouts());
}
void InitializeGPU() override {
@@ -366,6 +371,7 @@ class OzonePlatformEgltest : public OzonePlatform {
scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
+ scoped_ptr<KeyboardLayoutsOzone> keyboard_layouts_ozone_;
bool shim_initialized_;

Powered by Google App Engine
This is Rietveld 408576698