Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / base / ime / input_method_initializer.cc

diff --git a/src/ui/base/ime/input_method_initializer.cc b/src/ui/base/ime/input_method_initializer.cc
index 03291dc..507b51f 100644 (file)
--- a/src/ui/base/ime/input_method_initializer.cc
+++ b/src/ui/base/ime/input_method_initializer.cc
@@ -9,10 +9,6 @@
 #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)
-#include "base/win/metro.h"
-#include "ui/base/ime/input_method_factory.h"
-#include "ui/base/ime/win/tsf_bridge.h"
 #endif
 
 namespace {
@@ -31,19 +27,12 @@ void InitializeInputMethod() {
   chromeos::IMEBridge::Initialize();
 #elif defined(USE_AURA) && defined(OS_LINUX) && !defined(USE_OZONE)
   InputMethodAuraLinux::Initialize();
-#elif defined(OS_WIN)
-  if (base::win::IsTSFAwareRequired())
-    TSFBridge::Initialize();
 #endif
 }
 
 void ShutdownInputMethod() {
 #if defined(OS_CHROMEOS)
   chromeos::IMEBridge::Shutdown();
-#elif defined(OS_WIN)
-  internal::DestroySharedInputMethod();
-  if (base::win::IsTSFAwareRequired())
-    TSFBridge::Shutdown();
 #endif
 }
 
@@ -60,12 +49,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
 }
 
@@ -80,12 +63,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
 }