| Index: content/shell/browser/shell_browser_main_parts.cc
|
| diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc
|
| index d5cbed54496e2bc3f47707d6bfc2397b15e320e8..08eab4f43eb0f0bc7d2edd3df52b5eb8fbc3a089 100644
|
| --- a/content/shell/browser/shell_browser_main_parts.cc
|
| +++ b/content/shell/browser/shell_browser_main_parts.cc
|
| @@ -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)
|
|
|