diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-11 20:13:44 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-11 20:13:44 +0000 |
| commit | c274acc67753226943c28e01f24307610bb8c5c0 (patch) | |
| tree | 96a8342ddb53a3162f0748ebe90dc167bde86230 /chrome/test/automation/automation_proxy.h | |
| parent | 00b64f3980da6ce2c42007c14952f613c4adc640 (diff) | |
| download | chromium_src-c274acc67753226943c28e01f24307610bb8c5c0.zip chromium_src-c274acc67753226943c28e01f24307610bb8c5c0.tar.gz chromium_src-c274acc67753226943c28e01f24307610bb8c5c0.tar.bz2 | |
Only block alert() requests from blocked popups; not all popups.
Add two unit tests to make sure we do the right thing; required
adding a bunch of stuff to the automation layer.
Review URL: http://codereview.chromium.org/10282
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/automation_proxy.h')
| -rw-r--r-- | chrome/test/automation/automation_proxy.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index 8491832..5621b011 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -108,6 +108,14 @@ class AutomationProxy : public IPC::Channel::Listener, // Returns true on success. bool WaitForWindowCountToBecome(int target_count, int wait_timeout); + // Returns whether an app modal dialog window is showing right now (i.e., a + // javascript alert). + bool GetShowingAppModalDialog(bool* showing_app_modal_dialog); + + // Block the thread until a modal dialog is displayed. Returns true on + // success. + bool WaitForAppModalDialog(int wait_timeout); + // Returns the BrowserProxy for the browser window at the given index, // transferring ownership of the pointer to the caller. // On failure, returns NULL. @@ -217,4 +225,3 @@ class AutomationProxy : public IPC::Channel::Listener, }; #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__ - |