summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-09 18:17:09 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-09 18:17:09 +0000
commit464146ec15e527148efee8f6470dc4e6520d0ce4 (patch)
treec401012623265dba9c228dc14d253bc2cfeff9a3 /chrome/browser/automation
parent0e9020e23d636a40d32e83ce306468683ed03b01 (diff)
downloadchromium_src-464146ec15e527148efee8f6470dc4e6520d0ce4.zip
chromium_src-464146ec15e527148efee8f6470dc4e6520d0ce4.tar.gz
chromium_src-464146ec15e527148efee8f6470dc4e6520d0ce4.tar.bz2
Actually implement js message boxes on linux. This handles
alert, confirm and onbeforeunload. prompt has a dialog, but there's no text field. I'll work on that next. It turns out there's no nested message loop on the windows side, so there's no nested message loop here either. BUG=9493 Review URL: http://codereview.chromium.org/63134 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_provider.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index a7853be..81d0137 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -10,6 +10,7 @@
#include "base/thread.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/app_modal_dialog.h"
+#include "chrome/browser/app_modal_dialog_queue.h"
#include "chrome/browser/automation/automation_provider_list.h"
#include "chrome/browser/automation/url_request_failed_dns_job.h"
#include "chrome/browser/automation/url_request_mock_http_job.h"
@@ -35,7 +36,6 @@
#if defined(OS_WIN)
// TODO(port): Port these headers.
-#include "chrome/browser/app_modal_dialog_queue.h"
#include "chrome/browser/automation/ui_controls.h"
#include "chrome/browser/character_encoding.h"
#include "chrome/browser/download/save_package.h"
@@ -1257,7 +1257,8 @@ void AutomationProvider::GetBrowserWindowCount(int* window_count) {
}
#if defined(OS_WIN)
-// TODO(port): Enable when dialog delegate is ported.
+// TODO(port): Move the views::DialogDelegate::DialogButton enum out into a
+// common place then remove the OS_WIN guard.
void AutomationProvider::GetShowingAppModalDialog(bool* showing_dialog,
int* dialog_button) {
AppModalDialog* dialog_delegate = AppModalDialogQueue::active_dialog();