views: Inherit from views::WidgetDelegateView in more places.

chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc

Index: chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
index d65cc8a9163dbc72a4113b8b2c24eabaee08d5e9..201f2ecd0b9e202dafc73c6a8f574e590b06efd6 100644
--- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -72,7 +72,7 @@ class ConstrainedWebDialogDelegateViews
 class ConstrainedWebDialogDelegateViewViews
     : public views::WebView,
       public ConstrainedWebDialogDelegate,
-      public views::WidgetDelegate {
+      public views::WidgetDelegateView {

[Ben Goodger (Google), 2012/07/23 21:17:55]

again, wrong.

  public:
   ConstrainedWebDialogDelegateViewViews(
       Profile* profile,
@@ -84,7 +84,7 @@ class ConstrainedWebDialogDelegateViewViews
     return impl_->set_window(window);
   }
 
-  // ConstrainedWebDialogDelegate interface
+  // ConstrainedWebDialogDelegate:
   virtual const WebDialogDelegate*
       GetWebDialogDelegate() const OVERRIDE {
     return impl_->GetWebDialogDelegate();
@@ -105,7 +105,7 @@ class ConstrainedWebDialogDelegateViewViews
     return impl_->tab();
   }
 
-  // views::WidgetDelegate interface.
+  // views::WidgetDelegateView:
   virtual views::View* GetInitiallyFocusedView() OVERRIDE {
     return this;
   }
@@ -114,12 +114,6 @@ class ConstrainedWebDialogDelegateViewViews
     if (!impl_->closed_via_webui())
       GetWebDialogDelegate()->OnDialogClosed(std::string());
   }
-  virtual views::Widget* GetWidget() OVERRIDE {
-    return View::GetWidget();
-  }
-  virtual const views::Widget* GetWidget() const OVERRIDE {
-    return View::GetWidget();
-  }
   virtual string16 GetWindowTitle() const OVERRIDE {
     return impl_->closed_via_webui() ? string16() :
         GetWebDialogDelegate()->GetDialogTitle();
@@ -128,9 +122,8 @@ class ConstrainedWebDialogDelegateViewViews
     return this;
   }
 
-  // views::WebView overrides.
-  virtual bool AcceleratorPressed(
-      const ui::Accelerator& accelerator) OVERRIDE {
+  // views::WebView:
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE {
     // Pressing ESC closes the dialog.
     DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
     window()->CloseConstrainedWindow();