summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 22:21:02 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 22:21:02 +0000
commit0d5490e5ec372922b5884fa8e94dd0967545ea6b (patch)
treec7d19f940b1889025dc58890c01adff627c55c66 /chrome/plugin
parent6235541680600aecf07e7e85a63dc0843f1b7084 (diff)
downloadchromium_src-0d5490e5ec372922b5884fa8e94dd0967545ea6b.zip
chromium_src-0d5490e5ec372922b5884fa8e94dd0967545ea6b.tar.gz
chromium_src-0d5490e5ec372922b5884fa8e94dd0967545ea6b.tar.bz2
Re-enabling the IME for sandboxed flash
Basically undo http://codereview.chromium.org/5306002 because with the newer sandbox policy the IME editors should not be crashing anymore. Note that this does not fix the IME problem with sandboxed flash BUG=63352 TEST=see bug for details Review URL: http://codereview.chromium.org/6279004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/plugin_main.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index dee171c..9976770 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -68,13 +68,6 @@ bool IsPluginBuiltInFlash(const CommandLine& cmd_line) {
return (path.BaseName() == FilePath(L"gcswf32.dll"));
}
-// Disables Input method editor services for the whole process.
-void DisableIME() {
- if (0 == ::GetSystemMetrics(SM_IMMENABLED))
- return;
- ::ImmDisableIME(-1);
-}
-
#endif
// main() routine for running as the plugin process.
@@ -140,7 +133,6 @@ int PluginMain(const MainFunctionParams& parameters) {
// start elevated and it will call DelayedLowerToken(0) when it's ready.
if (IsPluginBuiltInFlash(parsed_command_line)) {
DVLOG(1) << "Sandboxing flash";
- DisableIME();
DelayedLowerToken(target_services);
} else {
target_services->LowerToken();