Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4857)

Unified Diff: chrome/browser/jsmessage_box_handler_win.h

Issue 27080: AppModalDialogQueue shouldn't depend on views. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/browser/jsmessage_box_handler_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/jsmessage_box_handler_win.h
===================================================================
--- chrome/browser/jsmessage_box_handler_win.h (revision 10204)
+++ chrome/browser/jsmessage_box_handler_win.h (working copy)
@@ -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 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 @@
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 @@
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();
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/browser/jsmessage_box_handler_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698