diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 01:54:03 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 01:54:03 +0000 |
| commit | 67a54912d23c2a0c87065e9a876971fda54edf70 (patch) | |
| tree | 0cb01248777f61bba238c52dc30152a0245174c1 /chrome/browser/jsmessage_box_handler_win.h | |
| parent | 8c414fb2b7a662540fb8f7f67802fec788347ac4 (diff) | |
| download | chromium_src-67a54912d23c2a0c87065e9a876971fda54edf70.zip chromium_src-67a54912d23c2a0c87065e9a876971fda54edf70.tar.gz chromium_src-67a54912d23c2a0c87065e9a876971fda54edf70.tar.bz2 | |
AppModalDialogQueue shouldn't depend on views.
Add a simple test, too.
Review URL: http://codereview.chromium.org/27080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/jsmessage_box_handler_win.h')
| -rw-r--r-- | chrome/browser/jsmessage_box_handler_win.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/chrome/browser/jsmessage_box_handler_win.h b/chrome/browser/jsmessage_box_handler_win.h index bac80dd..9e4804a 100644 --- a/chrome/browser/jsmessage_box_handler_win.h +++ b/chrome/browser/jsmessage_box_handler_win.h @@ -5,11 +5,12 @@ #ifndef CHROME_BROWSER_JSMESSAGE_BOX_HANDLER_WIN_H_ #define CHROME_BROWSER_JSMESSAGE_BOX_HANDLER_WIN_H_ +#include "chrome/browser/app_modal_dialog_delegate.h" #include "chrome/browser/jsmessage_box_handler.h" #include "chrome/common/ipc_message.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/views/app_modal_dialog_delegate.h" +#include "chrome/views/dialog_delegate.h" class MessageBoxView; class WebContents; @@ -18,8 +19,10 @@ class Window; } class JavascriptMessageBoxHandler - : public views::AppModalDialogDelegate, - public NotificationObserver { + : public AppModalDialogDelegate, + public AppModalDialogDelegateTesting, + public NotificationObserver, + public views::DialogDelegate { public: // Cross-platform code should use RunJavaScriptMessageBox. JavascriptMessageBoxHandler(WebContents* web_contents, @@ -30,6 +33,14 @@ class JavascriptMessageBoxHandler IPC::Message* reply_msg); virtual ~JavascriptMessageBoxHandler(); + // AppModalDialogDelegate Methods: + virtual void ShowModalDialog(); + virtual void ActivateModalDialog(); + virtual AppModalDialogDelegateTesting* GetTestingInterface(); + + // AppModalDialogDelegateTesting Methods: + virtual views::DialogDelegate* GetDialogDelegate(); + // views::DialogDelegate Methods: virtual int GetDialogButtons() const; virtual std::wstring GetWindowTitle() const; @@ -37,10 +48,6 @@ class JavascriptMessageBoxHandler virtual bool Cancel(); virtual bool Accept(); - // views::AppModalDialogDelegate - virtual void ShowModalDialog(); - virtual void ActivateModalDialog(); - // views::WindowDelegate Methods: virtual bool IsModal() const { return true; } virtual views::View* GetContentsView(); |