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

6 files changed, 10 insertions, 15 deletions

diff --git a/views/focus/accelerator_handler_gtk.cc b/views/focus/accelerator_handler_gtk.cc
index 6c50f8b..e795d06 100644
--- a/views/focus/accelerator_handler_gtk.cc
+++ b/views/focus/accelerator_handler_gtk.cc
@@ -8,7 +8,6 @@
 
 #include "views/accelerator.h"
 #include "views/focus/focus_manager.h"
-#include "views/widget/widget_gtk.h"
 
 namespace views {
 
@@ -16,7 +15,7 @@ AcceleratorHandler::AcceleratorHandler() {}
 
 bool AcceleratorHandler::Dispatch(GdkEvent* event) {
   // The logic for handling keyboard accelerators has been moved into
-  // WidgetGtk::OnEventKey handler (views/widget/widget_gtk.cc).
+  // NativeWidgetGtk::OnEventKey handler (views/widget/widget_gtk.cc).
   gtk_main_do_event(event);
   return true;
 }
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc
index 032b29d..1117cf9 100644
--- a/views/focus/accelerator_handler_touch.cc
+++ b/views/focus/accelerator_handler_touch.cc
@@ -18,7 +18,6 @@
 #include "views/ime/input_method.h"
 #include "views/touchui/touch_factory.h"
 #include "views/widget/root_view.h"
-#include "views/widget/widget_gtk.h"
 
 namespace views {
 
@@ -35,7 +34,7 @@ Widget* FindWidgetForGdkWindow(GdkWindow* gdk_window) {
   NativeWidget* widget = NativeWidget::GetNativeWidgetForNativeView(gtk_widget);
 
   if (!widget) {
-    DLOG(WARNING) << "no WidgetGtk found for that GtkWidget";
+    DLOG(WARNING) << "no NativeWidgetGtk found for that GtkWidget";
     return NULL;
   }
   return widget->GetWidget();
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index e26cfd2..da65e45 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -99,7 +99,7 @@ bool FocusManager::OnKeyEvent(const KeyEvent& event) {
 #if defined(OS_WIN)
   // If the focused view wants to process the key event as is, let it be.
   // On Linux we always dispatch key events to the focused view first, so
-  // we should not do this check here. See also WidgetGtk::OnKeyEvent().
+  // we should not do this check here. See also NativeWidgetGtk::OnKeyEvent().
   if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event))
     return true;
 #endif
@@ -215,7 +215,7 @@ View* FocusManager::GetNextFocusableView(View* original_starting_view,
     if (!focus_traversable) {
       if (!reverse) {
         // If the starting view has a focus traversable, use it.
-        // This is the case with WidgetWins for example.
+        // This is the case with NativeWidgetWins for example.
         focus_traversable = original_starting_view->GetFocusTraversable();
 
         // Otherwise default to the root view.
diff --git a/views/focus/focus_manager_gtk.cc b/views/focus/focus_manager_gtk.cc
index 29af1ef..98438c4 100644
--- a/views/focus/focus_manager_gtk.cc
+++ b/views/focus/focus_manager_gtk.cc
@@ -7,13 +7,13 @@
 #include "views/focus/focus_manager.h"
 
 #include "base/logging.h"
-#include "views/widget/widget_gtk.h"
+#include "views/widget/native_widget_gtk.h"
 #include "views/window/window_gtk.h"
 
 namespace views {
 
 void FocusManager::ClearNativeFocus() {
-  static_cast<WidgetGtk*>(widget_->native_widget())->ClearNativeFocus();
+  static_cast<NativeWidgetGtk*>(widget_->native_widget())->ClearNativeFocus();
 }
 
 void FocusManager::FocusNativeView(gfx::NativeView native_view) {
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 6f34241..c215c72 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -32,12 +32,8 @@
 #include "views/window/window.h"
 #include "views/window/window_delegate.h"
 
-#if defined(OS_WIN)
-#include "views/widget/widget_win.h"
-#include "views/window/window_win.h"
-#elif defined(OS_LINUX)
+#if defined(OS_LINUX)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
-#include "views/window/window_gtk.h"
 #endif
 
 namespace {
@@ -1500,7 +1496,7 @@ class MessageTrackingView : public View {
 #if defined(OS_WIN)
 // This test is now Windows only. Linux Views port does not handle accelerator
 // keys in AcceleratorHandler anymore. The logic has been moved into
-// WidgetGtk::OnKeyEvent().
+// NativeWidgetGtk::OnKeyEvent().
 // Tests that the keyup messages are eaten for accelerators.
 TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) {
   FocusManager* focus_manager = GetFocusManager();
diff --git a/views/focus/focus_manager_win.cc b/views/focus/focus_manager_win.cc
index d6f1e02..79d0b59 100644
--- a/views/focus/focus_manager_win.cc
+++ b/views/focus/focus_manager_win.cc
@@ -5,7 +5,8 @@
 #include "views/focus/focus_manager.h"
 
 #include "views/view.h"
-#include "views/widget/widget_win.h"
+#include "views/widget/native_widget.h"
+#include "views/widget/widget.h"
 
 namespace views {