Window Delegate Improvements:

- Windows now must have a Delegate. Just construct the default WindowDelegate
if
you don't want to have to write one in testing.
- Windows now obtain their contents view by asking the delegate via
WindowDelegate::GetContentsView.
- Contents views no longer need to manually store a pointer to the Window that
contains them, WindowDelegate does this automatically via its window()
accessor.

Reviewer notes:
- review window_delegate.h first, then
- window.h/cc
- custom frame window.h/cc
- constrained_window_impl.h/cc
- then everything else (just updating all call sites)

B=1280060

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

1 files changed, 9 insertions, 8 deletions

diff --git a/chrome/browser/views/password_manager_view.cc b/chrome/browser/views/password_manager_view.cc
index cf5eb50..86c6434 100644
--- a/chrome/browser/views/password_manager_view.cc
+++ b/chrome/browser/views/password_manager_view.cc
@@ -185,15 +185,12 @@ void PasswordManagerView::Show(Profile* profile) {
     instance_ = new PasswordManagerView(profile);
 
     // manager is owned by the dialog window, so Close() will delete it.
-    instance_->dialog_ = ChromeViews::Window::CreateChromeWindow(NULL,
-                                                                 gfx::Rect(),
-                                                                 instance_,
-                                                                 instance_);
+    ChromeViews::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);
   }
-  if (!instance_->dialog_->IsVisible()) {
-    instance_->dialog_->Show();
+  if (!instance_->window()->IsVisible()) {
+    instance_->window()->Show();
   } else {
-    instance_->dialog_->Activate();
+    instance_->window()->Activate();
   }
 }
 
@@ -358,7 +355,7 @@ std::wstring PasswordManagerView::GetWindowTitle() const {
 }
 
 void PasswordManagerView::ButtonPressed(ChromeViews::NativeButton* sender) {
-  DCHECK(dialog_);
+  DCHECK(window());
   // Close will result in our destruction.
   if (sender == &remove_all_button_) {
     table_model_.ForgetAndRemoveAllSignons();
@@ -397,3 +394,7 @@ void PasswordManagerView::WindowClosing() {
   // instance is created.
   instance_ = NULL;
 }
+
+ChromeViews::View* PasswordManagerView::GetContentsView() {
+  return this;
+}