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

Unified Diff: ui/ozone/platform/test/ozone_platform_test.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/test/ozone_platform_test.cc
diff --git a/ui/ozone/platform/test/ozone_platform_test.cc b/ui/ozone/platform/test/ozone_platform_test.cc
index 3a4e689f0cf0ff4bb1e263f7645f9d30ed2f9e22..2baecc8a79743bc82741442313b72fad7cda13d5 100644
--- a/ui/ozone/platform/test/ozone_platform_test.cc
+++ b/ui/ozone/platform/test/ozone_platform_test.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
+#include "ui/events/ozone/layout/stub/stub_keyboard_layouts.h"
#include "ui/events/platform/platform_event_source.h"
#include "ui/ozone/common/native_display_delegate_ozone.h"
#include "ui/ozone/platform/test/test_window.h"
@@ -42,6 +43,9 @@ class OzonePlatformTest : 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 {
@@ -61,6 +65,7 @@ class OzonePlatformTest : public OzonePlatform {
cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
+ keyboard_layouts_ozone_.reset(new StubKeyboardLayouts());
}
void InitializeGPU() override {
@@ -73,6 +78,7 @@ class OzonePlatformTest : 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_;
base::FilePath file_path_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformTest);

Powered by Google App Engine
This is Rietveld 408576698