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

Unified Diff: content/child/npapi/webplugin_delegate_impl.h

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 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 | « content/child/npapi/plugin_host.cc ('k') | content/common/cursors/webcursor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/npapi/webplugin_delegate_impl.h
diff --git a/content/child/npapi/webplugin_delegate_impl.h b/content/child/npapi/webplugin_delegate_impl.h
index a10eedd9cd39d897a9bff94db1f19235771732ed..d9ab5b9c626b780bef10f8682c90cc7e4888cdf3 100644
--- a/content/child/npapi/webplugin_delegate_impl.h
+++ b/content/child/npapi/webplugin_delegate_impl.h
@@ -20,12 +20,6 @@
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
-#if defined(USE_X11)
-#include "ui/base/x/x11_util.h"
-
-typedef struct _GdkDrawable GdkPixmap;
-#endif
-
namespace base {
class FilePath;
}
@@ -198,12 +192,6 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
void CGPaint(CGContextRef context, const gfx::Rect& rect);
#endif // OS_MACOSX && !USE_AURA
-#if defined(USE_X11)
- void SetWindowlessShmPixmap(XID shm_pixmap) {
- windowless_shm_pixmap_ = shm_pixmap;
- }
-#endif
-
private:
friend class base::DeleteHelper<WebPluginDelegateImpl>;
friend class WebPluginDelegate;
@@ -319,27 +307,6 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
scoped_ptr<WebPluginIMEWin> plugin_ime_;
#endif // defined(OS_WIN)
-#if defined(USE_X11)
- // The SHM pixmap for a windowless plugin.
- XID windowless_shm_pixmap_;
-#endif
-
-#if defined(TOOLKIT_GTK)
- // The pixmap we're drawing into, for a windowless plugin.
- GdkPixmap* pixmap_;
- double first_event_time_;
-
- // On Linux some plugins assume that the GtkSocket container is in the same
- // process. So we create a GtkPlug to plug into the browser's container, and
- // a GtkSocket to hold the plugin. We then send the GtkPlug to the browser
- // process.
- GtkWidget* plug_;
- GtkWidget* socket_;
-
- // Ensure pixmap_ exists and is at least width by height pixels.
- void EnsurePixmapAtLeastSize(int width, int height);
-#endif
-
NPWindow window_;
gfx::Rect window_rect_;
gfx::Rect clip_rect_;
« no previous file with comments | « content/child/npapi/plugin_host.cc ('k') | content/common/cursors/webcursor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698