Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl

ui/gfx/gl/gl_surface_linux.cc

 // 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.
 
 #include "ui/gfx/gl/gl_surface.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #if !defined(USE_WAYLAND)
@@ skipping 13 matching lines @@
 #if !defined(USE_WAYLAND)
 
 namespace {
 Display* g_osmesa_display;
 }  // namespace anonymous
 
 // This OSMesa GL surface can use XLib to swap the contents of the buffer to a
 // view.
 class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa {
  public:
-  explicit NativeViewGLSurfaceOSMesa(gfx::PluginWindowHandle window);
+  explicit NativeViewGLSurfaceOSMesa(gfx::AcceleratedWidget window);
   virtual ~NativeViewGLSurfaceOSMesa();
 
   static bool InitializeOneOff();
 
   // Implement a subset of GLSurface.
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool Resize(const gfx::Size& new_size) OVERRIDE;
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual std::string GetExtensions() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
 
  private:
   GC window_graphics_context_;
-  gfx::PluginWindowHandle window_;
+  gfx::AcceleratedWidget window_;
   GC pixmap_graphics_context_;
   Pixmap pixmap_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceOSMesa);
 };
 
 #endif //  !USE_WAYLAND
 
 bool GLSurface::InitializeOneOffInternal() {
   switch (GetGLImplementation()) {
@@ skipping 20 matching lines @@
     default:
       break;
   }
 
   return true;
 }
 
 #if !defined(USE_WAYLAND)
 
 NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
-    gfx::PluginWindowHandle window)
+    gfx::AcceleratedWidget window)
   : GLSurfaceOSMesa(OSMESA_BGRA, gfx::Size(1, 1)),
     window_graphics_context_(0),
     window_(window),
     pixmap_graphics_context_(0),
     pixmap_(0) {
   DCHECK(window);
 }
 
 NativeViewGLSurfaceOSMesa::~NativeViewGLSurfaceOSMesa() {
   Destroy();
@@ skipping 167 matching lines @@
             width, height,
             x, y);
 
   return true;
 }
 
 #endif //  !USE_WAYLAND
 
 scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
     bool software,
-    gfx::PluginWindowHandle window) {
+    gfx::AcceleratedWidget window) {
   if (software)
     return NULL;
 
   switch (GetGLImplementation()) {
 #if !defined(USE_WAYLAND)
     case kGLImplementationOSMesaGL: {
       scoped_refptr<GLSurface> surface(
           new NativeViewGLSurfaceOSMesa(window));
       if (!surface->Initialize())
         return NULL;
@@ skipping 58 matching lines @@
     }
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gfx