1 files changed, 13 insertions, 13 deletions

diff --git a/chrome/views/window.cc b/chrome/views/window.cc
index e5726c8..6c61ff0 100644
--- a/chrome/views/window.cc
+++ b/chrome/views/window.cc
@@ -129,7 +129,7 @@ void Window::Close() {
   if (client_view_->CanClose()) {
     SaveWindowPosition();
     RestoreEnabledIfNecessary();
-    ContainerWin::Close();
+    WidgetWin::Close();
     // If the user activates another app after opening us, then comes back and
     // closes us, we want our owner to gain activation.  But only if the owner
     // is visible. If we don't manually force that here, the other app will
@@ -221,7 +221,7 @@ gfx::Size Window::GetLocalizedContentsSize(int col_resource_id,
 // Window, protected:
 
 Window::Window(WindowDelegate* window_delegate)
-    : ContainerWin(),
+    : WidgetWin(),
       focus_on_creation_(true),
       window_delegate_(window_delegate),
       non_client_view_(NULL),
@@ -249,7 +249,7 @@ void Window::Init(HWND parent, const gfx::Rect& bounds) {
   // return NULL.
   owning_hwnd_ = parent;
   // We call this after initializing our members since our implementations of
-  // assorted ContainerWin functions may be called during initialization.
+  // assorted WidgetWin functions may be called during initialization.
   is_modal_ = window_delegate_->IsModal();
   if (is_modal_)
     BecomeModal();
@@ -260,7 +260,7 @@ void Window::Init(HWND parent, const gfx::Rect& bounds) {
   if (window_ex_style() == 0)
     set_window_ex_style(CalculateWindowExStyle());
 
-  ContainerWin::Init(parent, bounds, true);
+  WidgetWin::Init(parent, bounds, true);
   win_util::SetWindowUserData(GetHWND(), this);
   
   std::wstring window_title = window_delegate_->GetWindowTitle();
@@ -279,9 +279,9 @@ void Window::SetClientView(ClientView* client_view) {
   client_view_ = client_view;
   if (non_client_view_) {
     // This will trigger the ClientView to be added by the non-client view.
-    ContainerWin::SetContentsView(non_client_view_);
+    WidgetWin::SetContentsView(non_client_view_);
   } else {
-    ContainerWin::SetContentsView(client_view_);
+    WidgetWin::SetContentsView(client_view_);
   }
 }
 
@@ -313,7 +313,7 @@ void Window::RunSystemMenu(const CPoint& point) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// Window, ContainerWin overrides:
+// Window, WidgetWin overrides:
 
 void Window::OnActivate(UINT action, BOOL minimized, HWND window) {
   if (action == WA_INACTIVE)
@@ -325,13 +325,13 @@ LRESULT Window::OnAppCommand(HWND window, short app_command, WORD device,
   // We treat APPCOMMAND ids as an extension of our command namespace, and just
   // let the delegate figure out what to do...
   if (!window_delegate_->ExecuteWindowsCommand(app_command))
-    return ContainerWin::OnAppCommand(window, app_command, device, keystate);
+    return WidgetWin::OnAppCommand(window, app_command, device, keystate);
   return 0;
 }
 
 void Window::OnCommand(UINT notification_code, int command_id, HWND window) {
   if (!window_delegate_->ExecuteWindowsCommand(command_id))
-    ContainerWin::OnCommand(notification_code, command_id, window);
+    WidgetWin::OnCommand(notification_code, command_id, window);
 }
 
 void Window::OnDestroy() {
@@ -340,7 +340,7 @@ void Window::OnDestroy() {
     window_delegate_ = NULL;
   }
   RestoreEnabledIfNecessary();
-  ContainerWin::OnDestroy();
+  WidgetWin::OnDestroy();
 }
 
 LRESULT Window::OnNCActivate(BOOL active) {
@@ -349,7 +349,7 @@ LRESULT Window::OnNCActivate(BOOL active) {
     return DefWindowProc(GetHWND(), WM_NCACTIVATE, TRUE, 0);
   }
   // Otherwise just do the default thing.
-  return ContainerWin::OnNCActivate(active);
+  return WidgetWin::OnNCActivate(active);
 }
 
 LRESULT Window::OnNCHitTest(const CPoint& point) {
@@ -375,14 +375,14 @@ LRESULT Window::OnNCHitTest(const CPoint& point) {
 void Window::OnNCLButtonDown(UINT ht_component, const CPoint& point) {
   if (non_client_view_ && ht_component == HTSYSMENU)
     RunSystemMenu(non_client_view_->GetSystemMenuPoint());
-  ContainerWin::OnNCLButtonDown(ht_component, point);
+  WidgetWin::OnNCLButtonDown(ht_component, point);
 }
 
 void Window::OnNCRButtonDown(UINT ht_component, const CPoint& point) {
   if (ht_component == HTCAPTION || ht_component == HTSYSMENU) {
     RunSystemMenu(point);
   } else {
-    ContainerWin::OnNCRButtonDown(ht_component, point);
+    WidgetWin::OnNCRButtonDown(ht_component, point);
   }
 }