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

chrome/browser/ui/views/ash/panel_view_aura.h

Index: chrome/browser/ui/views/ash/panel_view_aura.h
diff --git a/chrome/browser/ui/views/ash/panel_view_aura.h b/chrome/browser/ui/views/ash/panel_view_aura.h
index dbe36d7984a8b41180c65689bf2569fc249b1f6f..d0ce505bf217b61da8a0aea3b263a19ea9a3fed9 100644
--- a/chrome/browser/ui/views/ash/panel_view_aura.h
+++ b/chrome/browser/ui/views/ash/panel_view_aura.h
@@ -37,7 +37,7 @@ class PanelHost;
 // PanelViewAura is used to display HTML in a Panel window.
 //
 class PanelViewAura : public views::NativeViewHost,
-                      public views::WidgetDelegate,
+                      public views::WidgetDelegateView,

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

This is wrong. If you do this, you'll end up subclassing View via both
NativeViewHost and WDV.

WDV is intended to mean "A View which is a WidgetDelegate" not "Something that
implements GetWidget()".

                       public BaseWindow {
  public:
   explicit PanelViewAura(const std::string& title);
@@ -64,14 +64,12 @@ class PanelViewAura : public views::NativeViewHost,
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
-  // Overridden from views::WidgetDelegate:
+  // Overridden from views::WidgetDelegateView:
   virtual bool CanResize() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual bool ShouldShowWindowTitle() const OVERRIDE;
-  virtual views::Widget* GetWidget() OVERRIDE;
-  virtual const views::Widget* GetWidget() const OVERRIDE;
   virtual views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) OVERRIDE;