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/dri/ozone_platform_dri.cc

Issue 742103002: Ozone keyboard layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lite-code
Patch Set: address review comments (Wez) + cleanup Created 6 years 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/dri/ozone_platform_dri.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc
index 4a2be7ef4d5769649d191c1d842e934caa94b069..6a7bbcb4ce3f963193ec8738de0cc360e9779997 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc
@@ -9,6 +9,8 @@
#include "ui/events/ozone/device/device_manager.h"
#include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
+#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
+#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
#include "ui/ozone/platform/dri/display_manager.h"
#include "ui/ozone/platform/dri/dri_buffer.h"
#include "ui/ozone/platform/dri/dri_cursor.h"
@@ -94,6 +96,8 @@ class OzonePlatformDri : public OzonePlatform {
new DriWindowManager(gpu_platform_support_host_.get()));
event_factory_ozone_.reset(new EventFactoryEvdev(window_manager_->cursor(),
device_manager_.get()));
+ KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
+ make_scoped_ptr(new StubKeyboardLayoutEngine()));
if (surface_factory_ozone_->InitializeHardware() !=
DriSurfaceFactory::INITIALIZED)
LOG(FATAL) << "Failed to initialize display hardware.";
@@ -129,6 +133,8 @@ class OzonePlatformDri : public OzonePlatform {
} // namespace
-OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; }
+OzonePlatform* CreateOzonePlatformDri() {
+ return new OzonePlatformDri;
+}
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698