Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: chrome/test/webdriver/automation.h

Issue 6992015: Fix minor issues in ChromeDriver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/webdriver/automation.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // server. 140 // server.
141 void GetChromeDriverAutomationVersion(int* version, Error** error); 141 void GetChromeDriverAutomationVersion(int* version, Error** error);
142 142
143 // Waits for all tabs to stop loading. 143 // Waits for all tabs to stop loading.
144 void WaitForAllTabsToStopLoading(Error** error); 144 void WaitForAllTabsToStopLoading(Error** error);
145 145
146 private: 146 private:
147 AutomationProxy* automation() const; 147 AutomationProxy* automation() const;
148 Error* GetIndicesForTab(int tab_id, int* browser_index, int* tab_index); 148 Error* GetIndicesForTab(int tab_id, int* browser_index, int* tab_index);
149 Error* CreateChromeError(const std::string& message); 149 Error* CreateChromeError(const std::string& message);
150 Error* CompareVersion(int client_build_no,
151 int client_patch_no,
152 bool* is_newer_or_equal);
153 Error* CheckVersion(int client_build_no,
154 int client_patch_no,
155 const std::string& error_msg);
156 Error* CheckAlertsSupported();
157 Error* CheckAdvancedInteractionsSupported();
150 158
151 scoped_ptr<ProxyLauncher> launcher_; 159 scoped_ptr<ProxyLauncher> launcher_;
152 160
153 DISALLOW_COPY_AND_ASSIGN(Automation); 161 DISALLOW_COPY_AND_ASSIGN(Automation);
154 }; 162 };
155 163
156 } // namespace webdriver 164 } // namespace webdriver
157 165
158 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation); 166 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation);
159 167
160 #endif // CHROME_TEST_WEBDRIVER_AUTOMATION_H_ 168 #endif // CHROME_TEST_WEBDRIVER_AUTOMATION_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/test/webdriver/automation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698