| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CHROME_TEST_WEBDRIVER_AUTOMATION_H_ | 5 #ifndef CHROME_TEST_WEBDRIVER_AUTOMATION_H_ | 
| 6 #define CHROME_TEST_WEBDRIVER_AUTOMATION_H_ | 6 #define CHROME_TEST_WEBDRIVER_AUTOMATION_H_ | 
| 7 | 7 | 
| 8 #include <map> | 8 #include <map> | 
| 9 #include <string> | 9 #include <string> | 
| 10 #include <vector> | 10 #include <vector> | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 62   // Executes the given |script| in the specified frame of the current | 62   // Executes the given |script| in the specified frame of the current | 
| 63   // tab. |result| will be set to the JSON result. Returns true on success. | 63   // tab. |result| will be set to the JSON result. Returns true on success. | 
| 64   void ExecuteScript(int tab_id, | 64   void ExecuteScript(int tab_id, | 
| 65                      const std::string& frame_xpath, | 65                      const std::string& frame_xpath, | 
| 66                      const std::string& script, | 66                      const std::string& script, | 
| 67                      std::string* result, | 67                      std::string* result, | 
| 68                      bool* success); | 68                      bool* success); | 
| 69 | 69 | 
| 70   // Sends a key event to the current browser. Waits until the key has | 70   // Sends a key event to the current browser. Waits until the key has | 
| 71   // been processed by the web page. | 71   // been processed by the web page. | 
| 72   void SendWebKeyEvent(int tab_id, const WebKeyEvent& key_event, bool* success); | 72   void SendWebKeyEvent(int tab_id, | 
|  | 73                        const WebKeyEvent& key_event, | 
|  | 74                        bool use_native_events, | 
|  | 75                        bool* success); | 
| 73 | 76 | 
| 74   void NavigateToURL(int tab_id, const std::string& url, bool* success); | 77   void NavigateToURL(int tab_id, const std::string& url, bool* success); | 
| 75   void GoForward(int tab_id, bool* success); | 78   void GoForward(int tab_id, bool* success); | 
| 76   void GoBack(int tab_id, bool* success); | 79   void GoBack(int tab_id, bool* success); | 
| 77   void Reload(int tab_id, bool* success); | 80   void Reload(int tab_id, bool* success); | 
| 78   void GetURL(int tab_id, std::string* url, bool* success); | 81   void GetURL(int tab_id, std::string* url, bool* success); | 
| 79   void GetGURL(int tab_id, GURL* gurl, bool* success); | 82   void GetGURL(int tab_id, GURL* gurl, bool* success); | 
| 80   void GetTabTitle(int tab_id, std::string* tab_title, bool* success); | 83   void GetTabTitle(int tab_id, std::string* tab_title, bool* success); | 
| 81   void GetCookies( | 84   void GetCookies( | 
| 82       int tab_id, const GURL& gurl, std::string* cookies, bool* success); | 85       int tab_id, const GURL& gurl, std::string* cookies, bool* success); | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 130   bool GetIndicesForTab(int tab_id, int* browser_index, int* tab_index); | 133   bool GetIndicesForTab(int tab_id, int* browser_index, int* tab_index); | 
| 131 | 134 | 
| 132   DISALLOW_COPY_AND_ASSIGN(Automation); | 135   DISALLOW_COPY_AND_ASSIGN(Automation); | 
| 133 }; | 136 }; | 
| 134 | 137 | 
| 135 }  // namespace webdriver | 138 }  // namespace webdriver | 
| 136 | 139 | 
| 137 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation); | 140 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation); | 
| 138 | 141 | 
| 139 #endif  // CHROME_TEST_WEBDRIVER_AUTOMATION_H_ | 142 #endif  // CHROME_TEST_WEBDRIVER_AUTOMATION_H_ | 
| OLD | NEW | 
|---|