Use gfx::NativeView instead of gfx::NativeWindow where appropriate. Switch to platform-specific types in the implementation files and change variable names to match the header. Based on cl 8783 by Evan Martin.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index f873fa1..5577040 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -118,10 +118,10 @@ gboolean MouseScrollEvent(GtkWidget* widget, GdkEventScroll* event,
 
 // -----------------------------------------------------------------------------
 
-gfx::NativeWindow WebWidgetHost::CreateWindow(gfx::NativeWindow box,
+GtkWidget* WebWidgetHost::CreateWindow(GtkWidget* parent_view,
                                               void* host) {
   GtkWidget* widget = gtk_drawing_area_new();
-  gtk_box_pack_start(GTK_BOX(box), widget, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(parent_view), widget, TRUE, TRUE, 0);
 
   gtk_widget_add_events(widget, GDK_EXPOSURE_MASK |
                                 GDK_POINTER_MOTION_MASK |
@@ -152,10 +152,10 @@ gfx::NativeWindow WebWidgetHost::CreateWindow(gfx::NativeWindow box,
   return widget;
 }
 
-WebWidgetHost* WebWidgetHost::Create(gfx::NativeWindow box,
+WebWidgetHost* WebWidgetHost::Create(GtkWidget* parent_view,
                                      WebWidgetDelegate* delegate) {
   WebWidgetHost* host = new WebWidgetHost();
-  host->view_ = CreateWindow(box, host);
+  host->view_ = CreateWindow(parent_view, host);
   host->webwidget_ = WebWidget::Create(delegate);
   // We manage our own double buffering because we need to be able to update
   // the expose area in an ExposeEvent within the lifetime of the event handler.
@@ -185,7 +185,7 @@ void WebWidgetHost::DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect) {
   DidInvalidateRect(clip_rect);
 }
 
-WebWidgetHost* FromWindow(gfx::NativeWindow view) {
+WebWidgetHost* FromWindow(GtkWidget* view) {
   const gpointer p = g_object_get_data(G_OBJECT(view), "webwidgethost");
   return (WebWidgetHost* ) p;
 }