Move WindowDelegate and NonClientView creation and management to Window.

This makes WindowGtk/WindowWin a little uglier for now, will improve with consolidation of more functions into Window.

BUG=72040
TEST=none

Review URL: http://codereview.chromium.org/6621033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77194 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 12 deletions

diff --git a/views/window/window.cc b/views/window/window.cc
index 3a14335..5531cff 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -11,13 +11,21 @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "views/widget/widget.h"
+#include "views/window/window_delegate.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Window, public:
 
-Window::Window() : native_window_(NULL) {
+Window::Window(WindowDelegate* window_delegate)
+    : native_window_(NULL),
+      window_delegate_(window_delegate),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          non_client_view_(new NonClientView(this))) {
+  DCHECK(window_delegate_);
+  DCHECK(!window_delegate_->window_);
+  window_delegate_->window_ = this;
 }
 
 Window::~Window() {
@@ -151,27 +159,28 @@ NonClientFrameView* Window::CreateFrameViewForWindow() {
 void Window::UpdateFrameAfterFrameChange() {
 }
 
-WindowDelegate* Window::GetDelegate() const {
+gfx::NativeWindow Window::GetNativeWindow() const {
   return NULL;
 }
 
-NonClientView* Window::GetNonClientView() const {
-  return NULL;
+bool Window::ShouldUseNativeFrame() const {
+  return false;
 }
 
-ClientView* Window::GetClientView() const {
-  return NULL;
+void Window::FrameTypeChanged() {
 }
 
-gfx::NativeWindow Window::GetNativeWindow() const {
-  return NULL;
-}
+////////////////////////////////////////////////////////////////////////////////
+// Window, internal::NativeWindowDelegate implementation:
 
-bool Window::ShouldUseNativeFrame() const {
-  return false;
+void Window::OnWindowDestroying() {
+  non_client_view_->WindowClosing();
+  window_delegate_->WindowClosing();
 }
 
-void Window::FrameTypeChanged() {
+void Window::OnWindowDestroyed() {
+  window_delegate_->DeleteDelegate();
+  window_delegate_ = NULL;
 }
 
 }  // namespace views