Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Unified Diff: ui/base/ime/input_method_initializer.cc

Issue 158483003: Logically revert r206996, which is no longer used in the era of Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/input_method_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8fbbd8ae1deabdd8e0b76618b0376919bd844253..507b51f708cfee030cf6376d291438c082c78405 100644
--- a/ui/base/ime/input_method_initializer.cc
+++ b/ui/base/ime/input_method_initializer.cc
@@ -9,9 +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"
#endif
namespace {
@@ -36,8 +33,6 @@ void InitializeInputMethod() {
void ShutdownInputMethod() {
#if defined(OS_CHROMEOS)
chromeos::IMEBridge::Shutdown();
-#elif defined(OS_WIN)
- internal::DestroySharedInputMethod();
#endif
}
@@ -68,8 +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();
#endif
}
« no previous file with comments | « ui/base/ime/input_method_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698