| 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_WEBDRIVER_AUTOMATION_H_ | 5 #ifndef CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ |
| 6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ | 6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 void GetBrowserVersion(std::string* version); | 155 void GetBrowserVersion(std::string* version); |
| 156 | 156 |
| 157 // Gets the ChromeDriver automation version supported by the automation | 157 // Gets the ChromeDriver automation version supported by the automation |
| 158 // server. | 158 // server. |
| 159 void GetChromeDriverAutomationVersion(int* version, Error** error); | 159 void GetChromeDriverAutomationVersion(int* version, Error** error); |
| 160 | 160 |
| 161 // Waits for all tabs to stop loading. | 161 // Waits for all tabs to stop loading. |
| 162 void WaitForAllTabsToStopLoading(Error** error); | 162 void WaitForAllTabsToStopLoading(Error** error); |
| 163 | 163 |
| 164 // Install packed extension. | 164 // Install packed extension. |
| 165 void InstallExtension(const FilePath& path, Error** error); | 165 void InstallExtensionDeprecated(const FilePath& path, Error** error); |
| 166 |
| 167 // Gets all installed extension IDs. |
| 168 void GetInstalledExtensions(std::vector<std::string>* extension_ids, |
| 169 Error** error); |
| 170 |
| 171 // Install a packed or unpacked extension. If the path ends with '.crx', |
| 172 // the extension is assumed to be packed. |
| 173 void InstallExtension(const FilePath& path, std::string* extension_id, |
| 174 Error** error); |
| 166 | 175 |
| 167 private: | 176 private: |
| 168 AutomationProxy* automation() const; | 177 AutomationProxy* automation() const; |
| 169 Error* GetIndicesForTab(int tab_id, int* browser_index, int* tab_index); | 178 Error* GetIndicesForTab(int tab_id, int* browser_index, int* tab_index); |
| 170 Error* CompareVersion(int client_build_no, | 179 Error* CompareVersion(int client_build_no, |
| 171 int client_patch_no, | 180 int client_patch_no, |
| 172 bool* is_newer_or_equal); | 181 bool* is_newer_or_equal); |
| 173 Error* CheckVersion(int client_build_no, | 182 Error* CheckVersion(int client_build_no, |
| 174 int client_patch_no, | 183 int client_patch_no, |
| 175 const std::string& error_msg); | 184 const std::string& error_msg); |
| 176 Error* CheckAlertsSupported(); | 185 Error* CheckAlertsSupported(); |
| 177 Error* CheckAdvancedInteractionsSupported(); | 186 Error* CheckAdvancedInteractionsSupported(); |
| 187 Error* CheckNewExtensionInterfaceSupported(); |
| 178 | 188 |
| 179 scoped_ptr<ProxyLauncher> launcher_; | 189 scoped_ptr<ProxyLauncher> launcher_; |
| 180 | 190 |
| 181 DISALLOW_COPY_AND_ASSIGN(Automation); | 191 DISALLOW_COPY_AND_ASSIGN(Automation); |
| 182 }; | 192 }; |
| 183 | 193 |
| 184 } // namespace webdriver | 194 } // namespace webdriver |
| 185 | 195 |
| 186 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation); | 196 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation); |
| 187 | 197 |
| 188 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ | 198 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ |
| OLD | NEW |