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

Unified Diff: base/win/metro.cc

Issue 137493006: Revert r156303 as non-Aura Metro mode is gone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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 | « base/win/metro.h ('k') | content/browser/browser_main_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « base/win/metro.h ('k') | content/browser/browser_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698