From 8dd404bbb05b99e7ee13b4e70899ebbcaeb3e8fb Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Tue, 22 Sep 2009 19:57:24 +0000 Subject: Automated ui test porting + cleanup: - Change POINTs to gfx::Point - Get rid of 2 unused automation messages (the messages themselves are staying for now so we don't mess with the reference build) -- add new automation messages to replace GetWindowHWND, which is not portable - re-enable automated_ui_test_interactive_test (it seems to have been dropped when we converted to gyp) - compile additional tests on linux (they don't pass, so they are disabled) - stub out linux tab dragging automation implementation (browser side) - delete various cruft BUG=19758 Review URL: http://codereview.chromium.org/211033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26846 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/automation/browser_proxy.h | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'chrome/test/automation/browser_proxy.h') diff --git a/chrome/test/automation/browser_proxy.h b/chrome/test/automation/browser_proxy.h index 8afa0b6..05b1b534 100644 --- a/chrome/test/automation/browser_proxy.h +++ b/chrome/test/automation/browser_proxy.h @@ -21,6 +21,7 @@ class WindowProxy; class AutocompleteEditProxy; namespace gfx { + class Point; class Rect; } @@ -122,22 +123,21 @@ class BrowserProxy : public AutomationResourceProxy { // desktop. bool ApplyAccelerator(int id); -#if defined(OS_WIN) - // TODO(port): Use portable replacement for POINT. - // Performs a drag operation between the start and end points (both defined // in window coordinates). |flags| specifies which buttons are pressed for // the drag, as defined in chrome/views/event.h. - virtual bool SimulateDrag(const POINT& start, const POINT& end, int flags, + virtual bool SimulateDrag(const gfx::Point& start, + const gfx::Point& end, + int flags, bool press_escape_en_route); // Like SimulateDrag, but returns false if response is not received before // the specified timeout. - virtual bool SimulateDragWithTimeout(const POINT& start, const POINT& end, + virtual bool SimulateDragWithTimeout(const gfx::Point& start, + const gfx::Point& end, int flags, uint32 timeout_ms, bool* is_timeout, bool press_escape_en_route); -#endif // defined(OS_WIN) // Block the thread until the tab count is |count|. // |wait_timeout| is the timeout, in milliseconds, for waiting. @@ -161,17 +161,6 @@ class BrowserProxy : public AutomationResourceProxy { // will be false. Returns false on failure. bool IsFindWindowFullyVisible(bool* is_visible); -#if defined(OS_WIN) - // TODO(port): Use portable equivalent of HWND. - - // Gets the outermost HWND that corresponds to the given browser. - // Returns true if the call was successful. - // Note that ideally this should go and the version of WindowProxy should be - // used instead. We have to keep it for start_up_tests that test against a - // reference build. - bool GetHWND(HWND* handle) const; -#endif // defined(OS_WIN) - // Run the specified command in the browser (see browser_commands.cc for the // list of supported commands). Returns true if the command was successfully // dispatched, false otherwise. @@ -206,6 +195,10 @@ class BrowserProxy : public AutomationResourceProxy { // Sets the boolean value of the specified preference. bool SetBooleanPreference(const std::wstring& name, bool value); + // Simulates a termination the browser session (as if the user logged off the + // mahine). + bool TerminateSession(); + protected: virtual ~BrowserProxy() {} private: -- cgit v1.1