diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 23:49:18 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 23:49:18 +0000 |
| commit | 478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d (patch) | |
| tree | f995985b8749bd31da7cbb73ec73cfce24e97987 /chrome/test/automation/automation_proxy.h | |
| parent | 69e38eca8034fe35c22744f59bee77f987ae8755 (diff) | |
| download | chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.zip chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.tar.gz chromium_src-478ff2ed6a244658c0a30d6cbfff1a9046b9ba9d.tar.bz2 | |
Reland r14146 which refactors DialogButton into cross platform
code. This is the same as the last change except I renamed
class MessageBox to class MessageBoxFlags to avoid conflicting
with the same name in windows.h.
Review URL: http://codereview.chromium.org/87065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/automation_proxy.h')
| -rw-r--r-- | chrome/test/automation/automation_proxy.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index e9d55d1..5c2cb22 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -16,14 +16,10 @@ #include "chrome/common/ipc_channel_proxy.h" #include "chrome/common/ipc_message.h" #include "chrome/common/ipc_sync_channel.h" +#include "chrome/common/message_box_flags.h" #include "chrome/test/automation/automation_handle_tracker.h" #include "chrome/test/automation/automation_messages.h" -#if defined(OS_WIN) -// TODO(port): Enable this or equivalent. -#include "chrome/views/window/dialog_delegate.h" -#endif - class AutomationRequest; class BrowserProxy; class TabProxy; @@ -98,17 +94,13 @@ class AutomationProxy : public IPC::Channel::Listener, // Returns true on success. bool WaitForWindowCountToBecome(int target_count, int wait_timeout); -#if defined(OS_WIN) - // TODO(port): Enable when we have portable DialogDelegate. - // Returns whether an app modal dialog window is showing right now (i.e., a // javascript alert), and what buttons it contains. bool GetShowingAppModalDialog(bool* showing_app_modal_dialog, - views::DialogDelegate::DialogButton* button); + MessageBoxFlags::DialogButton* button); // Simulates a click on a dialog button. - bool ClickAppModalDialogButton(views::DialogDelegate::DialogButton button); -#endif // defined(OS_WIN) + bool ClickAppModalDialogButton(MessageBoxFlags::DialogButton button); // Block the thread until a modal dialog is displayed. Returns true on // success. |