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

chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc

 // Copyright (c) 2012 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_web_dialog_delegate_base.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
@@ skipping 54 matching lines @@
   views::WebView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViews);
 };
 
 }  // namespace
 
 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,
       WebDialogDelegate* delegate,
       WebDialogWebContentsDelegate* tab_delegate);
   virtual ~ConstrainedWebDialogDelegateViewViews();
 
   void set_window(ConstrainedWindow* window) {
     return impl_->set_window(window);
   }
 
-  // ConstrainedWebDialogDelegate interface
+  // ConstrainedWebDialogDelegate:
   virtual const WebDialogDelegate*
       GetWebDialogDelegate() const OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual void OnDialogCloseFromWebUI() OVERRIDE {
     return impl_->OnDialogCloseFromWebUI();
   }
   virtual void ReleaseTabContentsOnDialogClose() OVERRIDE {
     return impl_->ReleaseTabContentsOnDialogClose();
   }
   virtual ConstrainedWindow* window() OVERRIDE {
     return impl_->window();
   }
   virtual TabContents* tab() OVERRIDE {
     return impl_->tab();
   }
 
-  // views::WidgetDelegate interface.
+  // views::WidgetDelegateView:
   virtual views::View* GetInitiallyFocusedView() OVERRIDE {
     return this;
   }
   virtual bool CanResize() const OVERRIDE { return true; }
   virtual void WindowClosing() OVERRIDE {
     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();
   }
   virtual views::View* GetContentsView() OVERRIDE {
     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();
     return true;
   }
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size;
     if (!impl_->closed_via_webui())
       GetWebDialogDelegate()->GetDialogSize(&size);
     return size;
@@ skipping 29 matching lines @@
     WebDialogDelegate* delegate,
     WebDialogWebContentsDelegate* tab_delegate,
     TabContents* container) {
   ConstrainedWebDialogDelegateViewViews* constrained_delegate =
       new ConstrainedWebDialogDelegateViewViews(profile, delegate, tab_delegate);
   ConstrainedWindow* constrained_window =
       new ConstrainedWindowViews(container, constrained_delegate);
   constrained_delegate->set_window(constrained_window);
   return constrained_delegate;
 }