Commit 1c3e3cb6 authored by cpu@chromium.org's avatar cpu@chromium.org

Remove another manually-bound user32 import

No need, we delayload now

BUG=none
TEST=chrome runs on XP

Review URL: http://codereview.chromium.org/8386011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108175 0039d316-1c4b-4281-b951-d872f2087c98
parent b207f31f
...@@ -241,13 +241,6 @@ bool LoadFlashBroker(const FilePath& plugin_path, CommandLine* cmd_line) { ...@@ -241,13 +241,6 @@ bool LoadFlashBroker(const FilePath& plugin_path, CommandLine* cmd_line) {
::CloseHandle(process); ::CloseHandle(process);
return true; return true;
} }
// Must be dynamically loaded to avoid startup failures on Win XP.
typedef BOOL (WINAPI *ChangeWindowMessageFilterFunction)(
UINT message,
DWORD flag);
ChangeWindowMessageFilterFunction g_ChangeWindowMessageFilter;
#endif // OS_WIN #endif // OS_WIN
} // namespace } // namespace
...@@ -358,16 +351,10 @@ bool ChromeContentClient::SandboxPlugin(CommandLine* command_line, ...@@ -358,16 +351,10 @@ bool ChromeContentClient::SandboxPlugin(CommandLine* command_line,
sandbox::USER_INTERACTIVE); sandbox::USER_INTERACTIVE);
// Allow the Flash plugin to forward some messages back to Chrome. // Allow the Flash plugin to forward some messages back to Chrome.
if (base::win::GetVersion() == base::win::VERSION_VISTA) { if (base::win::GetVersion() == base::win::VERSION_VISTA) {
if (!g_ChangeWindowMessageFilter) {
g_ChangeWindowMessageFilter =
reinterpret_cast<ChangeWindowMessageFilterFunction>(
::GetProcAddress(::GetModuleHandle(L"user32.dll"),
"ChangeWindowMessageFilter"));
}
// Per-window message filters required on Win7 or later must be added to: // Per-window message filters required on Win7 or later must be added to:
// render_widget_host_view_win.cc RenderWidgetHostViewWin::ReparentWindow // render_widget_host_view_win.cc RenderWidgetHostViewWin::ReparentWindow
g_ChangeWindowMessageFilter(WM_MOUSEWHEEL, MSGFLT_ADD); ::ChangeWindowMessageFilter(WM_MOUSEWHEEL, MSGFLT_ADD);
g_ChangeWindowMessageFilter(WM_APPCOMMAND, MSGFLT_ADD); ::ChangeWindowMessageFilter(WM_APPCOMMAND, MSGFLT_ADD);
} }
policy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW); policy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment