Fix even more crashes. To help identify remaining crashes now and in the future, I have made the ...

chrome/browser/ui/views/constrained_html_delegate_win.cc

 // Copyright (c) 2011 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/ui/webui/constrained_html_ui.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/gfx/rect.h"
 #include "views/view.h"
 #include "views/widget/widget_delegate.h"
 
 class ConstrainedHtmlDelegateWin : public TabContentsContainer,
                                    public ConstrainedHtmlUIDelegate,
                                    public ConstrainedWindowDelegate,
                                    public HtmlDialogTabContentsDelegate {
  public:
   ConstrainedHtmlDelegateWin(Profile* profile,
                              HtmlDialogUIDelegate* delegate);
   ~ConstrainedHtmlDelegateWin();
 
   // ConstrainedHtmlUIDelegate interface.
-  virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate();
-  virtual void OnDialogClose();
+  virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate() OVERRIDE;
+  virtual void OnDialogClose() OVERRIDE;
 
   // ConstrainedWindowDelegate (aka views::WidgetDelegate) interface.
-  virtual bool CanResize() const { return true; }
+  virtual bool CanResize() const OVERRIDE { return true; }
   virtual views::View* GetContentsView() {
     return this;
   }
-  virtual void WindowClosing() {
+  virtual void WindowClosing() OVERRIDE {
     html_delegate_->OnWindowClosed();
     html_delegate_->OnDialogClosed("");
   }
+  virtual views::Widget* GetWidget() OVERRIDE {
+    return View::GetWidget();
+  }
+  virtual const views::Widget* GetWidget() const OVERRIDE {
+    return View::GetWidget();
+  }
 
   // HtmlDialogTabContentsDelegate interface.
-  void MoveContents(TabContents* source, const gfx::Rect& pos) {}
-  void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {}
+  void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE {}
+  void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) OVERRIDE {}
 
   // Overridden from TabContentsContainer.
-  virtual gfx::Size GetPreferredSize() {
+  virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size;
     html_delegate_->GetDialogSize(&size);
     return size;
   }
 
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child) {
+                                    views::View* child) OVERRIDE {
     TabContentsContainer::ViewHierarchyChanged(is_add, parent, child);
     if (is_add && child == this) {
       ChangeTabContents(&html_tab_contents_);
     }
   }
 
   void set_window(ConstrainedWindow* window) {
     window_ = window;
   }
 
@@ skipping 40 matching lines @@
     Profile* profile,
     HtmlDialogUIDelegate* delegate,
     TabContents* container) {
   ConstrainedHtmlDelegateWin* constrained_delegate =
       new ConstrainedHtmlDelegateWin(profile, delegate);
   ConstrainedWindow* constrained_window =
       container->CreateConstrainedDialog(constrained_delegate);
   constrained_delegate->set_window(constrained_window);
   return constrained_window;
 }