Chromium Code Reviews| Index: components/mus/mus_app.cc |
| diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc |
| index 3d0edfa6a8c62efb2662a9584ec8c94cad35a761..008667fc7d0a696c9ebcd7cd337941ef5f513774 100644 |
| --- a/components/mus/mus_app.cc |
| +++ b/components/mus/mus_app.cc |
| @@ -29,6 +29,8 @@ |
| #include "ui/base/resource/resource_bundle.h" |
| #include "ui/base/ui_base_paths.h" |
| #include "ui/events/event_switches.h" |
| +#include "ui/events/ozone/layout/keyboard_layout_engine.h" |
|
sky
2016/04/05 20:27:45
Move to 42ish?
kylechar
2016/04/05 21:44:13
Done.
|
| +#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" |
| #include "ui/events/platform/platform_event_source.h" |
| #include "ui/gl/gl_surface.h" |
| @@ -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 |