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

Unified Diff: ui/ozone/platform/caca/ozone_platform_caca.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/caca/ozone_platform_caca.cc
diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc
index 9cb9fd0706e46f3b70ce2c3a56a94a76de58e0d3..15dab5986caa95910e9178a94d3be9bcc8c107d9 100644
--- a/ui/ozone/platform/caca/ozone_platform_caca.cc
+++ b/ui/ozone/platform/caca/ozone_platform_caca.cc
@@ -4,6 +4,7 @@
#include "ui/ozone/platform/caca/ozone_platform_caca.h"
+#include "ui/events/ozone/layout/stub/stub_keyboard_layouts.h"
#include "ui/ozone/common/native_display_delegate_ozone.h"
#include "ui/ozone/platform/caca/caca_event_source.h"
#include "ui/ozone/platform/caca/caca_window.h"
@@ -33,6 +34,9 @@ class OzonePlatformCaca : public OzonePlatform {
GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
return NULL; // no GPU support
}
+ KeyboardLayoutsOzone* GetKeyboardLayouts() override {
+ return keyboard_layouts_ozone_.get();
+ }
scoped_ptr<PlatformWindow> CreatePlatformWindow(
PlatformWindowDelegate* delegate,
const gfx::Rect& bounds) override {
@@ -50,6 +54,7 @@ class OzonePlatformCaca : public OzonePlatform {
window_manager_.reset(new CacaWindowManager);
event_source_.reset(new CacaEventSource());
cursor_factory_ozone_.reset(new CursorFactoryOzone());
+ keyboard_layouts_ozone_.reset(new StubKeyboardLayouts());
}
void InitializeGPU() override {}
@@ -58,6 +63,7 @@ class OzonePlatformCaca : public OzonePlatform {
scoped_ptr<CacaWindowManager> window_manager_;
scoped_ptr<CacaEventSource> event_source_;
scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
+ scoped_ptr<KeyboardLayoutsOzone> keyboard_layouts_ozone_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
};

Powered by Google App Engine
This is Rietveld 408576698