| Index: content/browser/browser_main_runner.cc
|
| diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
|
| index b2610b751af31276a4c01e02aab90d1b2b32dd31..1f644121a06df750f04f344d91ecb6128750cd38 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));
|
|
|