Move more from Window onto Widget.

views/window/dialog_client_view.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 #define VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 #pragma once
 
 #include "ui/gfx/font.h"
 #include "views/focus/focus_manager.h"
 #include "views/controls/button/button.h"
 #include "views/window/client_view.h"
 
 namespace views {
 
 class DialogDelegate;
 class NativeButton;
-class Window;
+class Widget;
 namespace internal {
 class RootView;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView
 //
 //  This ClientView subclass provides the content of a typical dialog box,
 //  including a strip of buttons at the bottom right of the window, default
 //  accelerator handlers for accept and cancel, and the ability for the
 //  embedded contents view to provide extra UI to be shown in the row of
 //  buttons.
 //
 //  DialogClientView also provides the ability to set an arbitrary view that is
 //  positioned beneath the buttons.
 //
 class DialogClientView : public ClientView,
                          public ButtonListener,
                          public FocusChangeListener {
  public:
-  DialogClientView(Window* window, View* contents_view);
+  DialogClientView(Widget* widget, View* contents_view);
   virtual ~DialogClientView();
 
-  // Adds the dialog buttons required by the supplied WindowDelegate to the
+  // Adds the dialog buttons required by the supplied DialogDelegate to the
   // view.
   void ShowDialogButtons();
 
   // Updates the enabled state and label of the buttons required by the
-  // supplied WindowDelegate
+  // supplied DialogDelegate
   void UpdateDialogButtons();
 
   // Accept the changes made in the window that contains this ClientView.
   void AcceptWindow();
 
   // Cancel the changes made in the window that contains this ClientView.
   void CancelWindow();
 
   // Accessors in case the user wishes to adjust these buttons.
   NativeButton* ok_button() const { return ok_button_; }
   NativeButton* cancel_button() const { return cancel_button_; }
 
   // Sets the view that is positioned along the bottom of the buttons. The
   // bottom view is positioned beneath the buttons at the full width of the
   // dialog. If there is an existing bottom view it is removed and deleted.
   void SetBottomView(View* bottom_view);
 
   // Overridden from View:
   virtual void NativeViewHierarchyChanged(
       bool attached,
       gfx::NativeView native_view,
       internal::RootView* root_view) OVERRIDE;
 
   // Overridden from ClientView:
   virtual bool CanClose() OVERRIDE;
-  virtual void WindowClosing() OVERRIDE;
+  virtual void WidgetClosing() OVERRIDE;
   virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
   virtual DialogClientView* AsDialogClientView() OVERRIDE;
 
   // FocusChangeListener implementation:
   virtual void FocusWillChange(View* focused_before,
                                View* focused_now) OVERRIDE;
 
  protected:
   // View overrides:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
@@ skipping 25 matching lines @@
   void SetDefaultButton(NativeButton* button);
 
   bool has_dialog_buttons() const { return ok_button_ || cancel_button_; }
 
   // Create and add the extra view, if supplied by the delegate.
   void CreateExtraView();
 
   // Returns the DialogDelegate for the window.
   DialogDelegate* GetDialogDelegate() const;
 
-  // Closes the window.
+  // Closes the widget.
   void Close();
 
   // Updates focus listener.
   void UpdateFocusListener();
 
   static void InitClass();
 
   // The dialog buttons.
   NativeButton* ok_button_;
   NativeButton* cancel_button_;
@@ skipping 28 matching lines @@
 
   // Static resource initialization
   static gfx::Font* dialog_button_font_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientView);
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_