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

chrome/browser/ui/views/frame/browser_view.h

Index: chrome/browser/ui/views/frame/browser_view.h
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 93104caf3f4bf9fd2002eae0e9f3e69bc9ca6db1..23a839903beee3ca0ad7b09449391aca773e8840 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -83,7 +83,7 @@ class BrowserView : public BrowserWindow,
                     public BrowserWindowTesting,
                     public TabStripModelObserver,
                     public ui::AcceleratorProvider,
-                    public views::WidgetDelegate,
+                    public views::WidgetDelegateView,

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

wrong

                     public views::Widget::Observer,
                     public views::ClientView,
                     public InfoBarContainer::Delegate,
@@ -365,7 +365,7 @@ class BrowserView : public BrowserWindow,
   virtual bool GetAcceleratorForCommandId(int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
 
-  // Overridden from views::WidgetDelegate:
+  // Overridden from views::WidgetDelegateView:
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
   virtual bool CanActivate() const OVERRIDE;
@@ -387,8 +387,6 @@ class BrowserView : public BrowserWindow,
   virtual views::ClientView* CreateClientView(views::Widget* widget) OVERRIDE;
   virtual void OnWindowBeginUserBoundsChange() OVERRIDE;
   virtual void OnWidgetMove() OVERRIDE;
-  virtual views::Widget* GetWidget() OVERRIDE;
-  virtual const views::Widget* GetWidget() const OVERRIDE;
 
   // Overridden from views::Widget::Observer
   virtual void OnWidgetActivationChanged(views::Widget* widget,