linux: Adding events to windowless plugins on Linux

webkit/glue/plugins/plugin_host.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.
 
-// 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.
-// See also webplugin_delegate_impl.cc.
-#define MOZ_X11 1
-
 #include "config.h"
 
 #include "webkit/glue/plugins/plugin_host.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 687 matching lines @@
       void **v = (void **)value;
       *v = np_object;
       rv = NPERR_NO_ERROR;
     } else {
       NOTREACHED();
     }
     break;
   }
   case NPNVnetscapeWindow:
   {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
     scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
-    HWND handle = plugin->window_handle();
+    gfx::NativeView handle = plugin->window_handle();
     *((void**)value) = (void*)handle;
     rv = NPERR_NO_ERROR;
 #else
     NOTIMPLEMENTED();
 #endif
     break;
   }
   case NPNVjavascriptEnabledBool:
   {
     // yes, JS is enabled.
@@ skipping 173 matching lines @@
 void NPN_PluginThreadAsyncCall(NPP id,
                          void (*func)(void *),
                          void *userData) {
   scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
   if (plugin) {
     plugin->PluginThreadAsyncCall(func, userData);
   }
 }
 
 } // extern "C"