linux: Adding events to windowless plugins on Linux

webkit/glue/plugins/test/plugin_javascript_open_popup.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
-#if defined(OS_LINUX)
-// HACK: we need this #define in place before npapi.h is included for
-// plugins to work. However, all sorts of headers include npapi.h, so
-// the only way to be certain the define is in place is to put it
-// here.  You might ask, "Why not set it in npapi.h directly, or in
-// this directory's SConscript, then?"  but it turns out this define
-// makes npapi.h include Xlib.h, which in turn defines a ton of symbols
-// like None and Status, causing conflicts with the aforementioned
-// many headers that include npapi.h.  Ugh.
-#define MOZ_X11 1
-#endif
-
 #include "webkit/glue/plugins/test/plugin_javascript_open_popup.h"
 
+#if defined(OS_LINUX)
+#include "third_party/npapi/bindings/npapi_x11.h"
+#endif
 #include "webkit/glue/plugins/test/plugin_client.h"
 
 namespace NPAPIClient {
 
 ExecuteJavascriptOpenPopupWithPluginTest::
     ExecuteJavascriptOpenPopupWithPluginTest(NPP id,
                                              NPNetscapeFuncs *host_functions)
     : PluginTest(id, host_functions),
       popup_window_test_started_(false) {
 }
@@ skipping 67 matching lines @@
 }
 #elif defined(OS_MACOSX)
 bool ExecuteJavascriptPopupWindowTargetPluginTest::CheckWindow(
     NPWindow* window) {
   // TODO(port) scaffolding--replace with a real test once NPWindow is done.
   return false;
 }
 #endif
 
 } // namespace NPAPIClient