diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 06:13:21 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 06:13:21 +0000 |
| commit | f938d60dc26ef9c23f2757d327052386ccd88689 (patch) | |
| tree | befcad667bd0e09dab7ae6c4541f8895a5d096f1 /chrome/test/automation | |
| parent | 4d82249eef448fd0b6c8c465f3846a77e870ddfc (diff) | |
| download | chromium_src-f938d60dc26ef9c23f2757d327052386ccd88689.zip chromium_src-f938d60dc26ef9c23f2757d327052386ccd88689.tar.gz chromium_src-f938d60dc26ef9c23f2757d327052386ccd88689.tar.bz2 | |
Make page_cycler_tests build on Linux (doesn't run successfully yet).
Review URL: http://codereview.chromium.org/40182
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
| -rw-r--r-- | chrome/test/automation/automation.scons | 1 | ||||
| -rw-r--r-- | chrome/test/automation/tab_proxy.cc | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/chrome/test/automation/automation.scons b/chrome/test/automation/automation.scons index b43146a..f4856c8 100644 --- a/chrome/test/automation/automation.scons +++ b/chrome/test/automation/automation.scons @@ -43,7 +43,6 @@ if not env.Bit('windows'): input_files.Remove( 'autocomplete_edit_proxy.cc', 'constrained_window_proxy.cc', - 'tab_proxy.cc', 'window_proxy.cc', ) diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index c5f40e1..bca9c03 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -114,7 +114,6 @@ bool TabProxy::CancelAuth() { if (!is_valid()) return false; - IPC::Message* response = NULL; int navigate_response = -1; sender_->Send(new AutomationMsg_CancelAuth(0, handle_, &navigate_response)); return navigate_response >= 0; @@ -124,7 +123,6 @@ bool TabProxy::NeedsAuth() const { if (!is_valid()) return false; - IPC::Message* response = NULL; bool needs_auth = false; sender_->Send(new AutomationMsg_NeedsAuth(0, handle_, &needs_auth)); return needs_auth; @@ -193,6 +191,8 @@ bool TabProxy::NavigateToURLAsync(const GURL& url) { return status; } +#if defined(OS_WIN) +// TODO(port): Get rid of HWND. bool TabProxy::GetHWND(HWND* hwnd) const { if (!is_valid()) return false; @@ -203,6 +203,7 @@ bool TabProxy::GetHWND(HWND* hwnd) const { return sender_->Send(new AutomationMsg_TabHWND(0, handle_, hwnd)); } +#endif // defined(OS_WIN) bool TabProxy::GetProcessID(int* process_id) const { if (!is_valid()) @@ -342,7 +343,7 @@ bool TabProxy::WaitForChildWindowCountToChange(int count, int* new_count, int wait_timeout) { int intervals = std::min(wait_timeout/automation::kSleepTime, 1); for (int i = 0; i < intervals; ++i) { - Sleep(automation::kSleepTime); + PlatformThread::Sleep(automation::kSleepTime); bool succeeded = GetConstrainedWindowCount(new_count); if (!succeeded) return false; if (count != *new_count) return true; @@ -437,6 +438,8 @@ bool TabProxy::Close(bool wait_until_closed) { return succeeded; } +#if defined(OS_WIN) +// TODO(port): Remove windowsisms. bool TabProxy::SetAccelerators(HACCEL accel_table, int accel_table_entry_count) { if (!is_valid()) @@ -455,6 +458,7 @@ bool TabProxy::ProcessUnhandledAccelerator(const MSG& msg) { new AutomationMsg_ProcessUnhandledAccelerator(0, handle_, msg)); // This message expects no response } +#endif // defined(OS_WIN) bool TabProxy::SetInitialFocus(bool reverse) { if (!is_valid()) |