Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl

BUG=104551
TEST=compile


Review URL: http://codereview.chromium.org/9160012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119990 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 10 deletions

diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc
index 722eaf0..c20a55a 100644
--- a/gpu/demos/framework/window.cc
+++ b/gpu/demos/framework/window.cc
@@ -57,7 +57,7 @@ void Window::OnPaint() {
   ::gles2::GetGLContext()->SwapBuffers();
 }
 
-bool Window::CreateRenderContext(gfx::PluginWindowHandle hwnd) {
+bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) {
   command_buffer_.reset(new CommandBufferService);
   if (!command_buffer_->Initialize()) {
     return false;
diff --git a/gpu/demos/framework/window.h b/gpu/demos/framework/window.h
index 80b8b67..fe8a39a 100644
--- a/gpu/demos/framework/window.h
+++ b/gpu/demos/framework/window.h
@@ -42,9 +42,9 @@ class Window {
   gfx::NativeWindow CreateNativeWindow(const wchar_t* title,
                                        int width, int height);
   // Converts native window handle to NPAPI plugin window handle.
-  gfx::PluginWindowHandle PluginWindow(gfx::NativeWindow hwnd);
+  gfx::AcceleratedWidget PluginWindow(gfx::NativeWindow hwnd);
   // Creates an OpenGL ES 2.0 rendering context for the given window.
-  bool CreateRenderContext(gfx::PluginWindowHandle hwnd);
+  bool CreateRenderContext(gfx::AcceleratedWidget hwnd);
 
   gfx::NativeWindow window_handle_;
   scoped_ptr<Demo> demo_;
diff --git a/gpu/demos/framework/window_linux.cc b/gpu/demos/framework/window_linux.cc
index a673612..d805d3d 100644
--- a/gpu/demos/framework/window_linux.cc
+++ b/gpu/demos/framework/window_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -56,7 +56,7 @@ gfx::NativeWindow Window::CreateNativeWindow(const wchar_t* title,
   return GTK_WINDOW(hwnd);
 }
 
-gfx::PluginWindowHandle Window::PluginWindow(gfx::NativeWindow hwnd) {
+gfx::AcceleratedWidget Window::PluginWindow(gfx::NativeWindow hwnd) {
   return GDK_WINDOW_XWINDOW(GTK_WIDGET(hwnd)->window);
 }
 
diff --git a/gpu/demos/framework/window_mac.mm b/gpu/demos/framework/window_mac.mm
index 4f07a24..153b68c 100644
--- a/gpu/demos/framework/window_mac.mm
+++ b/gpu/demos/framework/window_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -15,8 +15,8 @@ gfx::NativeWindow Window::CreateNativeWindow(const wchar_t* title,
   return NULL;
 }
 
-gfx::PluginWindowHandle Window::PluginWindow(gfx::NativeWindow hwnd) {
-  return gfx::kNullPluginWindow;
+gfx::AcceleratedWidget Window::PluginWindow(gfx::NativeWindow hwnd) {
+  return gfx::kNullAcceleratedWidget;
 }
 
 }  // namespace demos
diff --git a/gpu/demos/framework/window_win.cc b/gpu/demos/framework/window_win.cc
index dfd79fc..d083776 100644
--- a/gpu/demos/framework/window_win.cc
+++ b/gpu/demos/framework/window_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -96,7 +96,7 @@ gfx::NativeWindow Window::CreateNativeWindow(const wchar_t* title,
   return hwnd;
 }
 
-gfx::PluginWindowHandle Window::PluginWindow(gfx::NativeWindow hwnd) {
+gfx::AcceleratedWidget Window::PluginWindow(gfx::NativeWindow hwnd) {
   return hwnd;
 }