Ozone keyboard layout

ui/ozone/platform/dri/ozone_platform_dri.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/dri/ozone_platform_dri.h"
 
 #include "base/at_exit.h"
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
 #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"
 #include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
 #include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
 #include "ui/ozone/platform/dri/dri_surface_factory.h"
 #include "ui/ozone/platform/dri/dri_window.h"
 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h"
 #include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
 #include "ui/ozone/platform/dri/dri_window_manager.h"
@@ skipping 66 matching lines @@
     surface_factory_ozone_.reset(
         new DriSurfaceFactory(dri_.get(), &window_delegate_manager_));
     gpu_platform_support_.reset(new DriGpuPlatformSupport(
         dri_.get(), &window_delegate_manager_, screen_manager_.get(),
         scoped_ptr<NativeDisplayDelegateDri>(new NativeDisplayDelegateDri(
             dri_.get(), screen_manager_.get(), NULL))));
     gpu_platform_support_host_.reset(new DriGpuPlatformSupportHost());
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
     window_manager_.reset(
         new DriWindowManager(gpu_platform_support_host_.get()));
-    event_factory_ozone_.reset(new EventFactoryEvdev(window_manager_->cursor(),
-                                                     device_manager_.get()));
+    KeyboardLayoutEngineManager::Create(
+        make_scoped_ptr(new StubKeyboardLayoutEngine()));
+    event_factory_ozone_.reset(new EventFactoryEvdev(
+        window_manager_->cursor(), device_manager_.get(),
+        KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
     if (surface_factory_ozone_->InitializeHardware() !=
         DriSurfaceFactory::INITIALIZED)
       LOG(FATAL) << "Failed to initialize display hardware.";
 
     if (!ui_thread_gpu_.Initialize())
       LOG(FATAL) << "Failed to initialize dummy channel.";
   }
 
   void InitializeGPU() override {}
 
@@ skipping 15 matching lines @@
 
   DriWindowDelegateManager window_delegate_manager_;
 
   UiThreadGpu ui_thread_gpu_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri);
 };
 
 }  // namespace
 
-OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; }
+OzonePlatform* CreateOzonePlatformDri() {
+  return new OzonePlatformDri;
+}
 
 }  // namespace ui