diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 19:30:22 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 19:30:22 +0000 |
| commit | 7ba8d321651f3fa343a2728a7e84e0c181642224 (patch) | |
| tree | ac1bf988295c3500a89a7edb587600120abf824f /ui/base | |
| parent | bea2da08d1213049a8bf514aaf192440bf93a2ba (diff) | |
| download | chromium_src-7ba8d321651f3fa343a2728a7e84e0c181642224.zip chromium_src-7ba8d321651f3fa343a2728a7e84e0c181642224.tar.gz chromium_src-7ba8d321651f3fa343a2728a7e84e0c181642224.tar.bz2 | |
Do not create an InputMethodContextFactory for Ozone in input_method_initializer.cc
Ozone creates its own IMCF when the Ozone platform is initialized, causing
the CHECK in InitializeInputMethodForTesting to fail since 2 IMCF have been
created and the factory is now pointing to an unexpected value.
BUG=
Review URL: https://codereview.chromium.org/118513002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/ime/input_method_initializer.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/base/ime/input_method_initializer.cc b/ui/base/ime/input_method_initializer.cc index f324071..87e85ef 100644 --- a/ui/base/ime/input_method_initializer.cc +++ b/ui/base/ime/input_method_initializer.cc @@ -6,7 +6,7 @@ #if defined(OS_CHROMEOS) #include "ui/base/ime/chromeos/ibus_bridge.h" -#elif defined(USE_AURA) && defined(OS_LINUX) +#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(USE_OZONE) #include "ui/base/ime/input_method_auralinux.h" #include "ui/base/ime/linux/fake_input_method_context_factory.h" #elif defined(OS_WIN) @@ -17,7 +17,8 @@ namespace { -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) && \ + !defined(USE_OZONE) const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory; #endif @@ -28,7 +29,7 @@ namespace ui { void InitializeInputMethod() { #if defined(OS_CHROMEOS) chromeos::IBusBridge::Initialize(); -#elif defined(USE_AURA) && defined(OS_LINUX) +#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(USE_OZONE) InputMethodAuraLinux::Initialize(); #elif defined(OS_WIN) if (base::win::IsTSFAwareRequired()) @@ -49,7 +50,7 @@ void ShutdownInputMethod() { void InitializeInputMethodForTesting() { #if defined(OS_CHROMEOS) chromeos::IBusBridge::Initialize(); -#elif defined(USE_AURA) && defined(OS_LINUX) +#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(USE_OZONE) if (!g_linux_input_method_context_factory) g_linux_input_method_context_factory = new FakeInputMethodContextFactory(); const LinuxInputMethodContextFactory* factory = @@ -71,7 +72,7 @@ void InitializeInputMethodForTesting() { void ShutdownInputMethodForTesting() { #if defined(OS_CHROMEOS) chromeos::IBusBridge::Shutdown(); -#elif defined(USE_AURA) && defined(OS_LINUX) +#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(USE_OZONE) const LinuxInputMethodContextFactory* factory = LinuxInputMethodContextFactory::instance(); CHECK(!factory || factory == g_linux_input_method_context_factory) |