Merge 11311 - InputWindow's window delegate should pass DeleteDelegate throug...

chrome/browser/views/input_window.cc

 // 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.
 
 #include "chrome/browser/views/input_window.h"
 
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/label.h"
@@ skipping 17 matching lines @@
       : delegate_(delegate),
         focus_grabber_factory_(this) {
     DCHECK(delegate_);
   }
 
   // views::DialogDelegate overrides:
   virtual bool IsDialogButtonEnabled(DialogButton button) const;
   virtual bool Accept();
   virtual bool Cancel();
   virtual void WindowClosing();
+  virtual void DeleteDelegate();
   virtual std::wstring GetWindowTitle() const;
   virtual bool IsModal() const { return true; }
   virtual views::View* GetContentsView();
 
   // views::TextField::Controller overrides:
   virtual void ContentsChanged(views::TextField* sender,
                                const std::wstring& new_contents);
   virtual void HandleKeystroke(views::TextField*, UINT, TCHAR, UINT, UINT) {}
 
  protected:
@@ skipping 37 matching lines @@
 
 bool ContentView::Cancel() {
   delegate_->InputCanceled();
   return true;
 }
 
 void ContentView::WindowClosing() {
   delegate_->WindowClosing();
 }
 
+void ContentView::DeleteDelegate() {
+  delegate_->DeleteDelegate();
+}
+
 std::wstring ContentView::GetWindowTitle() const {
   return delegate_->GetWindowTitle();
 }
 
 views::View* ContentView::GetContentsView() {
   return this;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentView, views::TextField::Controller implementation:
@@ skipping 52 matching lines @@
 
 views::Window* CreateInputWindow(HWND parent_hwnd,
                                  InputWindowDelegate* delegate) {
   views::Window* window =
       views::Window::CreateChromeWindow(parent_hwnd, gfx::Rect(),
                                               new ContentView(delegate));
   window->client_view()->AsDialogClientView()->UpdateDialogButtons();
   return window;
 }