HtmlDialogContentsDelegate should not subclass views::WindowDelegate, for portability reasons (views isn't used on Mac or Linux).

Instead, add modal/title getting methods to HtmlDialogContentsDelegate directly, and have the UI (HtmlDialogView) call to these in the Modal/ModelessHtmlDialogDelegate in its implementation of views::WindowDelegate instead.

TEST=open any page and test that Page->Create application shortcuts still works. visit any site that uses Gears and make sure the Gears Allow/Deny dialog still comes up.
Review URL: http://codereview.chromium.org/27074

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

1 files changed, 3 insertions, 5 deletions

diff --git a/chrome/browser/modal_html_dialog_delegate.h b/chrome/browser/modal_html_dialog_delegate.h
index 3231af3..a5f5670 100644
--- a/chrome/browser/modal_html_dialog_delegate.h
+++ b/chrome/browser/modal_html_dialog_delegate.h
@@ -27,11 +27,9 @@ class ModalHtmlDialogDelegate
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // views::WindowDelegate implementation:
-  virtual bool IsModal() const;
-  virtual std::wstring GetWindowTitle() const { return L"Google Gears"; }
-
-  // ModalHtmlDialogContents::ModalHTMLDialogContentsDelegate implementation:
+  // HTMLDialogContentsDelegate implementation:
+  virtual bool IsDialogModal() const;
+  virtual std::wstring GetDialogTitle() const { return L"Google Gears"; }
   virtual GURL GetDialogContentURL() const;
   virtual void GetDialogSize(CSize* size) const;
   virtual std::string GetDialogArgs() const;