diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 21:29:34 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 21:29:34 +0000 |
| commit | f7a391a1808906f50e978355e911e2f7c2c31eb2 (patch) | |
| tree | 339b89a0879b8792e845627eb1d90d30fda3b410 /chrome/test | |
| parent | b0a457aea355b46adb429db11263a9c26bd1635e (diff) | |
| download | chromium_src-f7a391a1808906f50e978355e911e2f7c2c31eb2.zip chromium_src-f7a391a1808906f50e978355e911e2f7c2c31eb2.tar.gz chromium_src-f7a391a1808906f50e978355e911e2f7c2c31eb2.tar.bz2 | |
Re-land this change now that I've made a speculative fix to the DraggedTabController.
Review URL: http://codereview.chromium.org/10263
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/automation_messages_internal.h | 4 | ||||
| -rw-r--r-- | chrome/test/automation/browser_proxy.cc | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index e6cf72a..d6a321a8 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -293,8 +293,8 @@ IPC_BEGIN_MESSAGES(Automation, 0) // defined in chrome/views/event.h // Response: // bool - true if the drag could be performed - IPC_MESSAGE_ROUTED4(AutomationMsg_WindowDragRequest, - int, std::vector<POINT>, int, bool) + IPC_MESSAGE_ROUTED5(AutomationMsg_WindowDragRequest, + int, POINT, POINT, int, bool) IPC_MESSAGE_ROUTED1(AutomationMsg_WindowDragResponse, bool) // Similar to AutomationMsg_InitialLoadsComplete, this indicates that the diff --git a/chrome/test/automation/browser_proxy.cc b/chrome/test/automation/browser_proxy.cc index ce47335..58543e1 100644 --- a/chrome/test/automation/browser_proxy.cc +++ b/chrome/test/automation/browser_proxy.cc @@ -247,13 +247,9 @@ bool BrowserProxy::SimulateDragWithTimeout(const POINT& start, if (!is_valid()) return false; - std::vector<POINT> drag_path; - drag_path.push_back(start); - drag_path.push_back(end); - IPC::Message* response = NULL; bool succeeded = sender_->SendAndWaitForResponseWithTimeout( - new AutomationMsg_WindowDragRequest(0, handle_, drag_path, flags, + new AutomationMsg_WindowDragRequest(0, handle_, start, end, flags, press_escape_en_route), &response, AutomationMsg_WindowDragResponse::ID, timeout_ms, is_timeout); |