| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 48   void Terminate(); | 48   void Terminate(); | 
| 49 | 49 | 
| 50   // Executes the given |script| in the specified frame of the current | 50   // Executes the given |script| in the specified frame of the current | 
| 51   // tab. |result| will be set to the JSON result. Returns true on success. | 51   // tab. |result| will be set to the JSON result. Returns true on success. | 
| 52   void ExecuteScript(int tab_id, | 52   void ExecuteScript(int tab_id, | 
| 53                      const FramePath& frame_path, | 53                      const FramePath& frame_path, | 
| 54                      const std::string& script, | 54                      const std::string& script, | 
| 55                      std::string* result, | 55                      std::string* result, | 
| 56                      bool* success); | 56                      bool* success); | 
| 57 | 57 | 
| 58   // Sends a key event to the current browser. Waits until the key has | 58   // Sends a webkit key event to the current browser. Waits until the key has | 
| 59   // been processed by the web page. | 59   // been processed by the web page. | 
| 60   void SendWebKeyEvent(int tab_id, const WebKeyEvent& key_event, bool* success); | 60   void SendWebKeyEvent(int tab_id, | 
|  | 61                        const WebKeyEvent& key_event, | 
|  | 62                        bool* success); | 
|  | 63 | 
|  | 64   // Sends an OS level key event to the current browser. Waits until the key | 
|  | 65   // has been processed by the browser. | 
|  | 66   void SendNativeKeyEvent(int tab_id, | 
|  | 67                           ui::KeyboardCode key_code, | 
|  | 68                           int modifiers, | 
|  | 69                           bool* success); | 
| 61 | 70 | 
| 62   void NavigateToURL(int tab_id, const std::string& url, bool* success); | 71   void NavigateToURL(int tab_id, const std::string& url, bool* success); | 
| 63   void GoForward(int tab_id, bool* success); | 72   void GoForward(int tab_id, bool* success); | 
| 64   void GoBack(int tab_id, bool* success); | 73   void GoBack(int tab_id, bool* success); | 
| 65   void Reload(int tab_id, bool* success); | 74   void Reload(int tab_id, bool* success); | 
| 66   void GetURL(int tab_id, std::string* url, bool* success); | 75   void GetURL(int tab_id, std::string* url, bool* success); | 
| 67   void GetGURL(int tab_id, GURL* gurl, bool* success); | 76   void GetGURL(int tab_id, GURL* gurl, bool* success); | 
| 68   void GetTabTitle(int tab_id, std::string* tab_title, bool* success); | 77   void GetTabTitle(int tab_id, std::string* tab_title, bool* success); | 
| 69   void GetCookies( | 78   void GetCookies( | 
| 70       int tab_id, const GURL& gurl, std::string* cookies, bool* success); | 79       int tab_id, const GURL& gurl, std::string* cookies, bool* success); | 
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 106   scoped_ptr<ProxyLauncher> launcher_; | 115   scoped_ptr<ProxyLauncher> launcher_; | 
| 107 | 116 | 
| 108   DISALLOW_COPY_AND_ASSIGN(Automation); | 117   DISALLOW_COPY_AND_ASSIGN(Automation); | 
| 109 }; | 118 }; | 
| 110 | 119 | 
| 111 }  // namespace webdriver | 120 }  // namespace webdriver | 
| 112 | 121 | 
| 113 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation); | 122 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation); | 
| 114 | 123 | 
| 115 #endif  // CHROME_TEST_WEBDRIVER_AUTOMATION_H_ | 124 #endif  // CHROME_TEST_WEBDRIVER_AUTOMATION_H_ | 
| OLD | NEW | 
|---|