Rename WidgetWin/Gtk -> NativeWidgetWin/Gtk.

BUG=72040
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/7039050

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

3 files changed, 11 insertions, 11 deletions

diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc
index 6a00743..42321e5 100644
--- a/views/controls/native/native_view_host.cc
+++ b/views/controls/native/native_view_host.cc
@@ -129,8 +129,8 @@ void NativeViewHost::Layout() {
 void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
   // Paint background if there is one. NativeViewHost needs to paint
   // a background when it is hosted in a TabbedPane. For Gtk implementation,
-  // NativeTabbedPaneGtk uses a WidgetGtk as page container and because
-  // WidgetGtk hook "expose" with its root view's paint, we need to
+  // NativeTabbedPaneGtk uses a NativeWidgetGtk as page container and because
+  // NativeWidgetGtk hook "expose" with its root view's paint, we need to
   // fill the content. Otherwise, the tab page's background is not properly
   // cleared. For Windows case, it appears okay to not paint background because
   // we don't have a container window in-between. However if you want to use
diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc
index 2bc0e50..fedbc416 100644
--- a/views/controls/native/native_view_host_gtk.cc
+++ b/views/controls/native/native_view_host_gtk.cc
@@ -11,7 +11,7 @@
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/gtk_views_fixed.h"
-#include "views/widget/widget_gtk.h"
+#include "views/widget/native_widget_gtk.h"
 
 namespace views {
 
@@ -112,7 +112,7 @@ void NativeViewHostGtk::NativeViewAttached() {
     gtk_container_add(GTK_CONTAINER(fixed_), host_->native_view());
 
   // Let the widget know that the native component has been painted.
-  views::WidgetGtk::RegisterChildExposeHandler(host_->native_view());
+  views::NativeWidgetGtk::RegisterChildExposeHandler(host_->native_view());
 
   if (!destroy_signal_id_) {
     destroy_signal_id_ = g_signal_connect(host_->native_view(),
@@ -214,7 +214,7 @@ void NativeViewHostGtk::UninstallClip() {
 }
 
 void NativeViewHostGtk::ShowWidget(int x, int y, int w, int h) {
-  // x and y are the desired position of host_ in WidgetGtk coordinates.
+  // x and y are the desired position of host_ in NativeWidgetGtk coordinates.
   int fixed_x = x;
   int fixed_y = y;
   int fixed_w = w;
@@ -286,7 +286,7 @@ void NativeViewHostGtk::CreateFixed(bool needs_window) {
   // Defeat refcounting. We need to own the fixed.
   gtk_widget_ref(fixed_);
 
-  WidgetGtk* widget_gtk = GetHostWidget();
+  NativeWidgetGtk* widget_gtk = GetHostWidget();
   if (widget_gtk)
     widget_gtk->AddChild(fixed_);
 
@@ -322,14 +322,14 @@ void NativeViewHostGtk::DestroyFixed() {
   fixed_ = NULL;
 }
 
-WidgetGtk* NativeViewHostGtk::GetHostWidget() const {
-  return static_cast<WidgetGtk*>(host_->GetWidget()->native_widget());
+NativeWidgetGtk* NativeViewHostGtk::GetHostWidget() const {
+  return static_cast<NativeWidgetGtk*>(host_->GetWidget()->native_widget());
 }
 
 GtkWidget* NativeViewHostGtk::GetFocusedDescendant() {
   if (!fixed_)
     return NULL;
-  WidgetGtk* host = GetHostWidget();
+  NativeWidgetGtk* host = GetHostWidget();
   if (!host)
     return NULL;
   GtkWidget* top_level = gtk_widget_get_toplevel(host->GetNativeView());
diff --git a/views/controls/native/native_view_host_gtk.h b/views/controls/native/native_view_host_gtk.h
index 17ccd7e..eb98349 100644
--- a/views/controls/native/native_view_host_gtk.h
+++ b/views/controls/native/native_view_host_gtk.h
@@ -16,7 +16,7 @@
 namespace views {
 
 class View;
-class WidgetGtk;
+class NativeWidgetGtk;
 
 // Note that the NativeViewHostGtk assumes ownership of the GtkWidget attached
 // to it for the duration of its attachment. This is so the NativeViewHostGtk
@@ -50,7 +50,7 @@ class NativeViewHostGtk : public NativeViewHostWrapper {
   // Destroys the GtkFixed that performs clipping on our hosted GtkWidget.
   void DestroyFixed();
 
-  WidgetGtk* GetHostWidget() const;
+  NativeWidgetGtk* GetHostWidget() const;
 
   // Returns the descendant of fixed_ that has focus, or NULL if focus is not
   // on a descendant of fixed_.