| Index: chrome/test/webdriver/webdriver_automation.h
|
| diff --git a/chrome/test/webdriver/webdriver_automation.h b/chrome/test/webdriver/webdriver_automation.h
|
| index 03300e9631fe11a302179909d1f42928b0d017fa..c4f21bb20c9f759290987f01a8a80bb0c2cf1c10 100644
|
| --- a/chrome/test/webdriver/webdriver_automation.h
|
| +++ b/chrome/test/webdriver/webdriver_automation.h
|
| @@ -20,6 +20,9 @@
|
| class AutomationProxy;
|
| class ProxyLauncher;
|
| struct WebKeyEvent;
|
| +struct WebViewId;
|
| +struct WebViewInfo;
|
| +struct WebViewLocator;
|
|
|
| namespace base {
|
| class DictionaryValue;
|
| @@ -72,7 +75,7 @@ class Automation {
|
|
|
| // Executes the given |script| in the specified frame of the current
|
| // tab. |result| will be set to the JSON result. Returns true on success.
|
| - void ExecuteScript(int tab_id,
|
| + void ExecuteScript(const WebViewId& view_id,
|
| const FramePath& frame_path,
|
| const std::string& script,
|
| std::string* result,
|
| @@ -80,7 +83,7 @@ class Automation {
|
|
|
| // Sends a webkit key event to the current browser. Waits until the key has
|
| // been processed by the web page.
|
| - void SendWebKeyEvent(int tab_id,
|
| + void SendWebKeyEvent(const WebViewId& view_id,
|
| const WebKeyEvent& key_event,
|
| Error** error);
|
|
|
| @@ -92,7 +95,7 @@ class Automation {
|
| Error** error);
|
|
|
| // Drag and drop the file paths to the given location.
|
| - void DragAndDropFilePaths(int tab_id,
|
| + void DragAndDropFilePaths(const WebViewId& view_id,
|
| const Point& location,
|
| const std::vector<FilePath::StringType>& paths,
|
| Error** error);
|
| @@ -118,25 +121,30 @@ class Automation {
|
| base::DictionaryValue* cookie_dict,
|
| Error** error);
|
|
|
| - void MouseMove(int tab_id, const Point& p, Error** error);
|
| - void MouseClick(int tab_id,
|
| + void MouseMove(const WebViewId& view_id, const Point& p, Error** error);
|
| + void MouseClick(const WebViewId& view_id,
|
| const Point& p,
|
| automation::MouseButton button,
|
| Error** error);
|
| - void MouseDrag(int tab_id,
|
| + void MouseDrag(const WebViewId& view_id,
|
| const Point& start,
|
| const Point& end,
|
| Error** error);
|
| - void MouseButtonDown(int tab_id, const Point& p, Error** error);
|
| - void MouseButtonUp(int tab_id, const Point& p, Error** error);
|
| - void MouseDoubleClick(int tab_id, const Point& p, Error** error);
|
| + void MouseButtonDown(const WebViewId& view_id,
|
| + const Point& p,
|
| + Error** error);
|
| + void MouseButtonUp(const WebViewId& view_id,
|
| + const Point& p,
|
| + Error** error);
|
| + void MouseDoubleClick(const WebViewId& view_id,
|
| + const Point& p,
|
| + Error** error);
|
|
|
| - // Get persistent IDs for all the tabs currently open. These IDs can be used
|
| - // to identify the tab as long as the tab exists.
|
| - void GetTabIds(std::vector<int>* tab_ids, Error** error);
|
| + // Get info for all views currently open.
|
| + void GetViews(std::vector<WebViewInfo>* views, Error** error);
|
|
|
| - // Check if the given tab exists currently.
|
| - void DoesTabExist(int tab_id, bool* does_exist, Error** error);
|
| + // Check if the given view exists currently.
|
| + void DoesViewExist(const WebViewId& view_id, bool* does_exist, Error** error);
|
|
|
| void CloseTab(int tab_id, Error** error);
|
|
|
| @@ -175,7 +183,10 @@ class Automation {
|
|
|
| private:
|
| AutomationProxy* automation() const;
|
| - Error* GetIndicesForTab(int tab_id, int* browser_index, int* tab_index);
|
| + Error* GetIndicesForTab(
|
| + int tab_id, int* browser_index, int* tab_index);
|
| + Error* ConvertViewIdToLocator(const WebViewId& view_id,
|
| + WebViewLocator* view_locator);
|
| Error* CompareVersion(int client_build_no,
|
| int client_patch_no,
|
| bool* is_newer_or_equal);
|
|
|