Support for providing IMEContext with Ozone.

ui/base/ime/input_method_initializer.cc

Index: ui/base/ime/input_method_initializer.cc
diff --git a/ui/base/ime/input_method_initializer.cc b/ui/base/ime/input_method_initializer.cc
index 6579b056f90fb3f592582c72121bacd9590ad6d0..18ec547b5c6576b782e6d26abf8478ec75352b7d 100644
--- a/ui/base/ime/input_method_initializer.cc
+++ b/ui/base/ime/input_method_initializer.cc
@@ -10,20 +10,20 @@
 #include "base/logging.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/base/ime/chromeos/ibus_bridge.h"
-#elif defined(USE_AURA) && defined(USE_X11)
-#include "base/memory/scoped_ptr.h"
-#include "ui/base/ime/input_method_auralinux.h"
-#include "ui/base/ime/linux/fake_input_method_context_factory.h"
 #elif defined(OS_WIN)
 #include "base/win/metro.h"
 #include "ui/base/ime/win/tsf_bridge.h"
+#elif defined(USE_AURA)

[Yuki, 2013/12/11 09:31:14]

It's not a good idea to swap OS_WIN and USE_AURA.
Please use defined(USE_AURA) && defined(OS_LINUX) instead.

Remember Mac could use Aura in future.

+#include "base/memory/scoped_ptr.h"
+#include "ui/base/ime/input_method_auralinux.h"
+#include "ui/base/ime/linux/fake_input_method_context_factory.h"
 #endif
 
 namespace {
 
 #if defined(OS_CHROMEOS)
 bool dbus_thread_manager_was_initialized = false;
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA) && !defined(OS_WIN)

[Yuki, 2013/12/11 09:31:14]

Better to be defined(OS_LINUX).

 const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory;
 #endif
 
@@ -34,11 +34,11 @@ namespace ui {
 void InitializeInputMethod() {
 #if defined(OS_CHROMEOS)
   chromeos::IBusBridge::Initialize();
-#elif defined(USE_AURA) && defined(USE_X11)
-  InputMethodAuraLinux::Initialize();
 #elif defined(OS_WIN)
   if (base::win::IsTSFAwareRequired())
     TSFBridge::Initialize();
+#elif defined(USE_AURA)

[Yuki, 2013/12/11 09:31:14]

Ditto.

+  InputMethodAuraLinux::Initialize();
 #endif
 }
 
@@ -60,7 +60,13 @@ void InitializeInputMethodForTesting() {
     chromeos::DBusThreadManager::InitializeWithStub();
     dbus_thread_manager_was_initialized = true;
   }
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(OS_WIN)
+  if (base::win::IsTSFAwareRequired()) {
+    // Make sure COM is initialized because TSF depends on COM.
+    CoInitialize(NULL);
+    TSFBridge::Initialize();
+  }
+#elif defined(USE_AURA)
   if (!g_linux_input_method_context_factory)
     g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
   const LinuxInputMethodContextFactory* factory =
@@ -70,12 +76,6 @@ void InitializeInputMethodForTesting() {
       << "else.";
   LinuxInputMethodContextFactory::SetInstance(
       g_linux_input_method_context_factory);
-#elif defined(OS_WIN)
-  if (base::win::IsTSFAwareRequired()) {
-    // Make sure COM is initialized because TSF depends on COM.
-    CoInitialize(NULL);
-    TSFBridge::Initialize();
-  }
 #endif
 }
 
@@ -88,7 +88,13 @@ void ShutdownInputMethodForTesting() {
     dbus_thread_manager_was_initialized = false;
   }
   ui::InputMethodFactory::SetInstance(NULL);
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(OS_WIN)
+  internal::DestroySharedInputMethod();
+  if (base::win::IsTSFAwareRequired()) {
+    TSFBridge::Shutdown();
+    CoUninitialize();
+  }
+#elif defined(USE_AURA)
   const LinuxInputMethodContextFactory* factory =
       LinuxInputMethodContextFactory::instance();
   CHECK(!factory || factory == g_linux_input_method_context_factory)
@@ -96,12 +102,6 @@ void ShutdownInputMethodForTesting() {
   LinuxInputMethodContextFactory::SetInstance(NULL);
   delete g_linux_input_method_context_factory;
   g_linux_input_method_context_factory = NULL;
-#elif defined(OS_WIN)
-  internal::DestroySharedInputMethod();
-  if (base::win::IsTSFAwareRequired()) {
-    TSFBridge::Shutdown();
-    CoUninitialize();
-  }
 #endif
 }