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

Unified Diff: content/browser/browser_main_runner.cc

Issue 1613393003: Remove XP-only ImmDisableTextFrameService call. Base URL: https://chromium.googlesource.com/chromium/src.git@dead-xp-code
Patch Set: Created 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_runner.cc
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 9ee9ee17a1b3bddffdaa8c3f95efbd3df769fe02..607e080267d0d57a882599cb98097d8184c2041f 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -34,7 +34,6 @@
#endif
#if defined(OS_WIN)
-#include "base/win/windows_version.h"
#include "ui/base/win/scoped_ole_initializer.h"
#include "ui/gfx/win/direct_write.h"
#endif
@@ -84,20 +83,6 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
base::debug::WaitForDebugger(60, true);
#endif
-#if defined(OS_WIN)
- 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.com/160914.
- // TODO(yukawa): Add a high-level wrapper for this instead of calling
- // Win32 API here directly.
- ImmDisableTextFrameService(static_cast<DWORD>(-1));
- }
-#endif // OS_WIN
-
base::StatisticsRecorder::Initialize();
notification_service_.reset(new NotificationServiceImpl);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698