diff options
| author | yukawa@chromium.org <yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 11:45:05 +0000 |
|---|---|---|
| committer | yukawa@chromium.org <yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 11:45:05 +0000 |
| commit | b4b591bcefaf17fc1e1aa9ae6a447952078b03ae (patch) | |
| tree | ef34affbf7f015f745da70ae926303abd0012e8f /content/browser/browser_main_runner.cc | |
| parent | 19b75c7ac98a7bc053458be540d232a77504b9e4 (diff) | |
| download | chromium_src-b4b591bcefaf17fc1e1aa9ae6a447952078b03ae.zip chromium_src-b4b591bcefaf17fc1e1aa9ae6a447952078b03ae.tar.gz chromium_src-b4b591bcefaf17fc1e1aa9ae6a447952078b03ae.tar.bz2 | |
Revert r156303 as non-Aura Metro mode is gone
We no longer need to support TSF in the browser code. Now TSF-related code
is completely consolidated into the metro_driver process and the browser
process doesn't need to know about TSF any more.
Note: TSF-related code remaining in base/win/metro.{cc, h} and
content/browser/browser_main_runner.{h, cc} will be reverted by subsequent CLs.
BUG=319122, 330735
Review URL: https://codereview.chromium.org/137493006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_runner.cc')
| -rw-r--r-- | content/browser/browser_main_runner.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index b2610b7..1f64412 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -20,7 +20,6 @@ #include "ui/base/ime/input_method_initializer.h" #if defined(OS_WIN) -#include "base/win/metro.h" #include "base/win/windows_version.h" #include "ui/base/win/scoped_ole_initializer.h" #endif @@ -54,17 +53,13 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { #endif #if defined(OS_WIN) - if (parameters.command_line.HasSwitch( - switches::kEnableTextServicesFramework)) { - base::win::SetForceToUseTSF(); - } else if (base::win::GetVersion() < base::win::VERSION_VISTA) { + if (base::win::GetVersion() < base::win::VERSION_VISTA) { // When "Extend support of advanced text services to all programs" // (a.k.a. Cicero Unaware Application Support; CUAS) is enabled on // Windows XP and handwriting modules shipped with Office 2003 are // installed, "penjpn.dll" and "skchui.dll" will be loaded and then - // crash - // unless a user installs Office 2003 SP3. To prevent these modules from - // being loaded, disable TSF entirely. crbug/160914. + // crash unless a user installs Office 2003 SP3. To prevent these + // modules from being loaded, disable TSF entirely. crbug.com/160914. // TODO(yukawa): Add a high-level wrapper for this instead of calling // Win32 API here directly. ImmDisableTextFrameService(static_cast<DWORD>(-1)); |