Commit 281d6fa7 authored by sky's avatar sky Committed by Commit bot

Fix crash on startup of mandoline-linux

Recent changes to IME ( https://codereview.chromium.org/1155013005 )
mean we need to initialize IME.

BUG=none
TEST=none
R=erg@chromium.org

Review URL: https://codereview.chromium.org/1177783002

Cr-Commit-Position: refs/heads/master@{#333775}
parent 0cdbcd5d
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "base/path_service.h" #include "base/path_service.h"
#include "mandoline/ui/aura/screen_mojo.h" #include "mandoline/ui/aura/screen_mojo.h"
#include "ui/aura/env.h" #include "ui/aura/env.h"
#include "ui/base/ime/input_method_initializer.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h" #include "ui/base/ui_base_paths.h"
...@@ -41,6 +42,8 @@ AuraInit::AuraInit(mojo::Shell* shell) { ...@@ -41,6 +42,8 @@ AuraInit::AuraInit(mojo::Shell* shell) {
screen_.reset(ScreenMojo::Create()); screen_.reset(ScreenMojo::Create());
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
InitializeResources(shell); InitializeResources(shell);
ui::InitializeInputMethodForTesting();
} }
AuraInit::~AuraInit() { AuraInit::~AuraInit() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment