Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux

content/plugin/webplugin_proxy.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
 #define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
 #endif
 #include "base/memory/scoped_handle.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "content/child/npapi/webplugin.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "url/gurl.h"
-#if defined(USE_X11)
-#include "ui/base/x/x11_util.h"
-#endif
 #include "ui/gl/gpu_preference.h"
 #include "ui/surface/transport_dib.h"
 
 struct PluginMsg_FetchURL_Params;
 
 namespace content {
 class PluginChannel;
 class WebPluginDelegateImpl;
 
 #if defined(OS_MACOSX)
@@ skipping 124 matching lines @@
 #if defined(OS_WIN)
   void CreateCanvasFromHandle(const TransportDIB::Handle& dib_handle,
                               const gfx::Rect& window_rect,
                               skia::RefPtr<SkCanvas>* canvas);
 #elif defined(OS_MACOSX)
   static void CreateDIBAndCGContextFromHandle(
       const TransportDIB::Handle& dib_handle,
       const gfx::Rect& window_rect,
       scoped_ptr<TransportDIB>* dib_out,
       base::ScopedCFTypeRef<CGContextRef>* cg_context_out);
-#elif defined(USE_X11)
-  static void CreateDIBAndCanvasFromHandle(
-      const TransportDIB::Handle& dib_handle,
-      const gfx::Rect& window_rect,
-      scoped_refptr<SharedTransportDIB>* dib_out,
-      skia::RefPtr<SkCanvas>* canvas);
-
-  static void CreateShmPixmapFromDIB(
-      TransportDIB* dib,
-      const gfx::Rect& window_rect,
-      XID* pixmap_out);
 #endif
 
   // Updates the shared memory sections where windowless plugins paint.
   void SetWindowlessBuffers(const TransportDIB::Handle& windowless_buffer0,
                             const TransportDIB::Handle& windowless_buffer1,
                             const gfx::Rect& window_rect);
 
 #if defined(OS_MACOSX)
   CGContextRef windowless_context() const {
     return windowless_contexts_[windowless_buffer_index_].get();
   }
 #else
   skia::RefPtr<SkCanvas> windowless_canvas() const {
     return windowless_canvases_[windowless_buffer_index_];
   }
-
-#if defined(USE_X11)
-  XID windowless_shm_pixmap() const {
-    return windowless_shm_pixmaps_[windowless_buffer_index_];
-  }
-#endif
-
 #endif
 
   typedef base::hash_map<int, WebPluginResourceClient*> ResourceClientMap;
   ResourceClientMap resource_clients_;
 
   scoped_refptr<PluginChannel> channel_;
   int route_id_;
   NPObject* window_npobject_;
   NPObject* plugin_element_;
   WebPluginDelegateImpl* delegate_;
   gfx::Rect damaged_rect_;
   bool waiting_for_paint_;
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   // Variables used for desynchronized windowless plugin painting. See note in
   // webplugin_delegate_proxy.h for how this works. The two sets of windowless_*
   // fields are for the front-buffer and back-buffer of a buffer flipping system
   // and windowless_buffer_index_ identifies which set we are using as the
   // back-buffer at any given time.
   int windowless_buffer_index_;
 #if defined(OS_MACOSX)
   scoped_ptr<TransportDIB> windowless_dibs_[2];
   base::ScopedCFTypeRef<CGContextRef> windowless_contexts_[2];
   scoped_ptr<WebPluginAcceleratedSurfaceProxy> accelerated_surface_;
 #else
   skia::RefPtr<SkCanvas> windowless_canvases_[2];
-
-#if defined(USE_X11)
-  scoped_refptr<SharedTransportDIB> windowless_dibs_[2];
-  // If we can use SHM pixmaps for windowless plugin painting or not.
-  bool use_shm_pixmap_;
-  // The SHM pixmaps for windowless plugin painting.
-  XID windowless_shm_pixmaps_[2];
-#endif
-
 #endif
 
   // Contains the routing id of the host render view.
   int host_render_view_routing_id_;
 
   base::WeakPtrFactory<WebPluginProxy> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_