7 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/bubble/border_widget_win.cc b/chrome/browser/ui/views/bubble/border_widget_win.cc
index 8c72485..df5c959 100644
--- a/chrome/browser/ui/views/bubble/border_widget_win.cc
+++ b/chrome/browser/ui/views/bubble/border_widget_win.cc
@@ -10,7 +10,7 @@
 #include "views/widget/widget.h"
 
 BorderWidgetWin::BorderWidgetWin()
-    : views::WidgetWin(new views::Widget),
+    : views::NativeWidgetWin(new views::Widget),
       border_contents_(NULL) {
 }
 
diff --git a/chrome/browser/ui/views/generic_info_view_unittest.cc b/chrome/browser/ui/views/generic_info_view_unittest.cc
index 7274970..dd74bfe 100644
--- a/chrome/browser/ui/views/generic_info_view_unittest.cc
+++ b/chrome/browser/ui/views/generic_info_view_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/generic_info_view.h"
 #include "grit/chromium_strings.h"
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index c56565a..8961bca 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -128,7 +128,7 @@ FocusManager::WidgetFocusManager* FocusManager::GetWidgetFocusManager() {
 bool FocusManager::OnKeyEvent(const KeyEvent& event) {
   // 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;
 
@@ -372,7 +372,7 @@ View* FocusManager::GetNextFocusableView(
     if (!focus_traversable) {
       if (IsTraverseForward(direction)) {
         // 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/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h
index 58f553d..a132ccc 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -48,7 +48,7 @@
 // method SetNextFocusableView().
 //
 // If you are embedding a native view containing a nested RootView (for example
-// by adding a NativeControl that contains a WidgetWin as its native
+// by adding a NativeControl that contains a NativeWidgetWin as its native
 // component), then you need to:
 // - override the View::GetFocusTraversable() method in your outer component.
 //   It should return the RootView of the inner component. This is used when
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 9bb4513..73fea38 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -171,7 +171,7 @@ bool Widget::OnMouseEvent(const MouseEvent& event) {
       return false;
     case ui::Event::ET_MOUSE_RELEASED:
       // TODO(beng): NativeWidgetGtk should not call this function if drag data
-      //             exists, see comment in this function in WidgetGtk.
+      //             exists, see comment in this function in NativeWidgetGtk.
       // Release the capture first, that way we don't get confused if
       // OnMouseReleased blocks.
       if (native_widget_->HasMouseCapture() &&
diff --git a/views/controls/menu/submenu_view.h b/views/controls/menu/submenu_view.h
index 5325e33..54dc6c3 100644
--- a/views/controls/menu/submenu_view.h
+++ b/views/controls/menu/submenu_view.h
@@ -25,7 +25,7 @@ class MenuScrollViewContainer;
 // . Forwards the appropriate events to the MenuController. This allows the
 //   MenuController to update the selection as the user moves the mouse around.
 // . Renders the drop indicator during a drop operation.
-// . Shows and hides the window (a WidgetWin) when the menu is shown on
+// . Shows and hides the window (a NativeWidgetWin) when the menu is shown on
 //   screen.
 //
 // SubmenuView is itself contained in a MenuScrollViewContainer.
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 37713ba..5983dbc 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -47,7 +47,7 @@
 // method SetNextFocusableView().
 //
 // If you are embedding a native view containing a nested RootView (for example
-// by adding a NativeControl that contains a WidgetWin as its native
+// by adding a NativeControl that contains a NativeWidgetWin as its native
 // component), then you need to:
 // - override the View::GetFocusTraversable() method in your outer component.
 //   It should return the RootView of the inner component. This is used when