| Index: components/mus/mus_app.cc
|
| diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc
|
| index 3d0edfa6a8c62efb2662a9584ec8c94cad35a761..de56eaf43ed4069b7f3f6a6e2e492db9a4a3dd15 100644
|
| --- a/components/mus/mus_app.cc
|
| +++ b/components/mus/mus_app.cc
|
| @@ -37,6 +37,8 @@
|
| #include "base/command_line.h"
|
| #include "ui/platform_window/x11/x11_window.h"
|
| #elif defined(USE_OZONE)
|
| +#include "ui/events/ozone/layout/keyboard_layout_engine.h"
|
| +#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
|
| #include "ui/ozone/public/ozone_platform.h"
|
| #endif
|
|
|
| @@ -143,6 +145,10 @@ void MandolineUIServicesApp::Initialize(mojo::Connector* connector,
|
| // Because GL libraries need to be initialized before entering the sandbox,
|
| // in MUS, |InitializeForUI| will load the GL libraries.
|
| ui::OzonePlatform::InitializeForUI();
|
| +
|
| + // TODO(kylechar): We might not always want a US keyboard layout.
|
| + ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()
|
| + ->SetCurrentLayoutByName("us");
|
| #endif
|
|
|
| // TODO(rjkroege): Enter sandbox here before we start threads in GpuState
|
|
|