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

chrome/browser/ui/views/web_dialog_view.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_WEB_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_WEB_DIALOG_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 22 matching lines @@
 // expected to send back a JSON file as a return value.
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TODO(akalin): Make WebDialogView contain an WebDialogWebContentsDelegate
 // instead of inheriting from it to avoid violating the "no multiple
 // inheritance" rule.
 class WebDialogView : public views::ClientView,
                       public WebDialogWebContentsDelegate,
                       public ui::WebDialogDelegate,
-                      public views::WidgetDelegate {
+                      public views::WidgetDelegateView {

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

wrong

  public:
   WebDialogView(content::BrowserContext* context,
                 ui::WebDialogDelegate* delegate);
   virtual ~WebDialogView();
 
   // For testing.
   content::WebContents* web_contents();
 
   // Overridden from views::ClientView:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator)
       OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE;
   virtual bool CanClose() OVERRIDE;
 
-  // Overridden from views::WidgetDelegate:
+  // Overridden from views::WidgetDelegateView:
   virtual bool CanResize() const OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual std::string GetWindowName() const OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual ClientView* CreateClientView(views::Widget* widget) OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual bool ShouldShowWindowTitle() const OVERRIDE;
-  virtual views::Widget* GetWidget() OVERRIDE;
-  virtual const views::Widget* GetWidget() const OVERRIDE;
 
   // Overridden from ui::WebDialogDelegate:
   virtual ui::ModalType GetDialogModalType() const OVERRIDE;
   virtual string16 GetDialogTitle() const OVERRIDE;
   virtual GURL GetDialogContentURL() const OVERRIDE;
   virtual void GetWebUIMessageHandlers(
       std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;
   virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
   virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE;
   virtual std::string GetDialogArgs() const OVERRIDE;
@@ skipping 39 matching lines @@
   // closing) we delegate to the creator of this view, which we keep track of
   // using this variable.
   ui::WebDialogDelegate* delegate_;
 
   views::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDialogView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WEB_DIALOG_VIEW_H_