Commit 054f6665 authored by spang@chromium.org's avatar spang@chromium.org

Fix content_shell under ozone

We need to call ui::InitializeInputMethodForTesting. This is currently
protected by USE_X11 but should not be.

TBR=pfeldman
BUG=none
TEST=content_shell --ozone-platform=egltest

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272895 0039d316-1c4b-4281-b951-d872f2087c98
parent 31a5bc2e
......@@ -41,9 +41,9 @@
#if defined(USE_AURA) && defined(USE_X11)
#include "ui/events/x/touch_factory_x11.h"
#if !defined(OS_CHROMEOS)
#include "ui/base/ime/input_method_initializer.h"
#endif
#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
#include "ui/base/ime/input_method_initializer.h"
#endif
namespace content {
......@@ -108,7 +108,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() {
}
void ShellBrowserMainParts::PreEarlyInitialization() {
#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(USE_X11)
#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
ui::InitializeInputMethodForTesting();
#endif
#if defined(OS_ANDROID)
......
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