Index: base/win/metro.cc |
diff --git a/base/win/metro.cc b/base/win/metro.cc |
index c78cc0946ee2c42cc323ce53ae99a1076b35d48e..1911f906b8ead3bc9cdb39eb10ddeb9f06f7bbfc 100644 |
--- a/base/win/metro.cc |
+++ b/base/win/metro.cc |
@@ -12,10 +12,6 @@ |
namespace base { |
namespace win { |
-namespace { |
-bool g_should_tsf_aware_required = false; |
-} |
- |
HMODULE GetMetroModule() { |
const HMODULE kUninitialized = reinterpret_cast<HMODULE>(1); |
static HMODULE metro_module = kUninitialized; |
@@ -73,35 +69,7 @@ bool IsProcessImmersive(HANDLE process) { |
bool IsTSFAwareRequired() { |
// Although this function is equal to IsMetroProcess at this moment, |
// Chrome for Win7 and Vista may support TSF in the future. |
- return g_should_tsf_aware_required || IsMetroProcess(); |
-} |
- |
-void SetForceToUseTSF() { |
- g_should_tsf_aware_required = true; |
- |
- // Since Windows 8 Metro mode disables CUAS (Cicero Unaware Application |
- // Support) via ImmDisableLegacyIME API, Chrome must be fully TSF-aware on |
- // Metro mode. For debugging purposes, explicitly call ImmDisableLegacyIME so |
- // that one can test TSF functionality even on Windows 8 desktop mode. Note |
- // that CUAS cannot be disabled on Windows Vista/7 where ImmDisableLegacyIME |
- // is not available. |
- typedef BOOL (* ImmDisableLegacyIMEFunc)(); |
- HMODULE imm32 = ::GetModuleHandleA("imm32.dll"); |
- if (imm32 == NULL) |
- return; |
- |
- ImmDisableLegacyIMEFunc imm_disable_legacy_ime = |
- reinterpret_cast<ImmDisableLegacyIMEFunc>( |
- ::GetProcAddress(imm32, "ImmDisableLegacyIME")); |
- |
- if (imm_disable_legacy_ime == NULL) { |
- // Unsupported API, just do nothing. |
- return; |
- } |
- |
- if (!imm_disable_legacy_ime()) { |
- DVLOG(1) << "Failed to disable legacy IME."; |
- } |
+ return IsMetroProcess(); |
} |
wchar_t* LocalAllocAndCopyString(const string16& src) { |