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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_PANEL_VIEW_AURA_H_
 #define CHROME_BROWSER_UI_VIEWS_ASH_PANEL_VIEW_AURA_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 19 matching lines @@
 }
 
 namespace internal {
 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);
   virtual ~PanelViewAura();
 
   views::Widget* Init(Profile* profile,
                       const GURL& url,
                       const gfx::Rect& bounds);
 
   // Returns the WebContents associated with this panel.
   content::WebContents* WebContents();
 
   // Close the panel window.
   void CloseView();
 
   // Set the preferred size of the contents.
   void SetContentPreferredSize(const gfx::Size& size);
 
   const SessionID& session_id() const { return session_id_; }
   extensions::WindowController* extension_window_controller() const {
     return extension_window_controller_.get();
   }
 
   // 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;
 
   // Overridden from BaseWindow:
   virtual bool IsActive() const OVERRIDE;
   virtual bool IsMaximized() const OVERRIDE;
   virtual bool IsMinimized() const OVERRIDE;
   virtual bool IsFullscreen() const OVERRIDE;
   virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
@@ skipping 18 matching lines @@
   // Owned internal host class implementing WebContents and Extension Delegates.
   scoped_ptr<internal::PanelHost> host_;
   // Unowned pointer to the widget.
   views::Widget* widget_;
   scoped_ptr<extensions::WindowController> extension_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelViewAura);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_PANEL_VIEW_AURA_H_