Move more from Window onto Widget.

views/window/dialog_delegate.h

 // Copyright (c) 2010 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_DELEGATE_H_
 #define VIEWS_WINDOW_DIALOG_DELEGATE_H_
 #pragma once
 
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/message_box_flags.h"
@@ skipping 78 matching lines @@
   // presses if there is no "Cancel" button.  This function should return
   // true if the window can be closed after the window can be closed after
   // it returns, or false if it must remain open.  If |window_closing| is
   // true, it means that this handler is being called because the window is
   // being closed (e.g.  by Window::Close) and there is no Cancel handler,
   // so Accept is being called instead.
   virtual bool Accept(bool window_closing);
   virtual bool Accept();
 
   // Overridden from WindowDelegate:
-  virtual View* GetInitiallyFocusedView();
-
-  // Overridden from WindowDelegate:
-  virtual ClientView* CreateClientView(Window* window);
+  virtual View* GetInitiallyFocusedView() OVERRIDE;
+  virtual ClientView* CreateClientView(Widget* widget) OVERRIDE;
 
   // Called when the window has been closed.
   virtual void OnClose() {}
 
   // A helper for accessing the DialogClientView object contained by this
   // delegate's Window.
   DialogClientView* GetDialogClientView() const;
 
  protected:
   // Overridden from WindowDelegate:
   virtual ui::AccessibilityTypes::Role GetAccessibleWindowRole() const OVERRIDE;
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WINDOW_DIALOG_DELEGATE_H_