Fixes a bunch of crashes from my Widget removal yesterday. These places were not overriding GetWidget() from WidgetDelegate. I have made them either subclass Widget/DialogDelegateView in the cases where the delegate is-a view, or override GetWidget in the case where the delegate is not a view.

Re-enables an affected test.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7149021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89022 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 7 deletions

diff --git a/chrome/browser/ui/views/external_protocol_dialog.h b/chrome/browser/ui/views/external_protocol_dialog.h
index 445131c..f4d4eef 100644
--- a/chrome/browser/ui/views/external_protocol_dialog.h
+++ b/chrome/browser/ui/views/external_protocol_dialog.h
@@ -30,14 +30,16 @@ class ExternalProtocolDialog : public views::DialogDelegate {
   virtual ~ExternalProtocolDialog();
 
   // views::DialogDelegate Methods:
-  virtual int GetDefaultDialogButton() const;
+  virtual int GetDefaultDialogButton() const OVERRIDE;
   virtual std::wstring GetDialogButtonLabel(
-      MessageBoxFlags::DialogButton button) const;
-  virtual std::wstring GetWindowTitle() const;
-  virtual void DeleteDelegate();
-  virtual bool Cancel();
-  virtual bool Accept();
-  virtual views::View* GetContentsView();
+      MessageBoxFlags::DialogButton button) const OVERRIDE;
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
+  virtual void DeleteDelegate() OVERRIDE;
+  virtual bool Cancel() OVERRIDE;
+  virtual bool Accept() OVERRIDE;
+  virtual views::View* GetContentsView() OVERRIDE;
+  virtual views::Widget* GetWidget() OVERRIDE;
+  virtual const views::Widget* GetWidget() const OVERRIDE;
 
   // views::WindowDelegate Methods:
   virtual bool IsAlwaysOnTop() const { return false; }