| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_SESSION_H_ | 5 #ifndef CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ |
| 6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ | 6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 | 343 |
| 344 const Capabilities& capabilities() const; | 344 const Capabilities& capabilities() const; |
| 345 | 345 |
| 346 // Gets the browser connection state. | 346 // Gets the browser connection state. |
| 347 Error* GetBrowserConnectionState(bool* online); | 347 Error* GetBrowserConnectionState(bool* online); |
| 348 | 348 |
| 349 // Gets the status of the application cache. | 349 // Gets the status of the application cache. |
| 350 Error* GetAppCacheStatus(int* status); | 350 Error* GetAppCacheStatus(int* status); |
| 351 | 351 |
| 352 private: | 352 private: |
| 353 void RunSessionTask(Task* task); | |
| 354 void RunSessionTaskOnSessionThread( | |
| 355 Task* task, | |
| 356 base::WaitableEvent* done_event); | |
| 357 void RunSessionTask(const base::Closure& task); | 353 void RunSessionTask(const base::Closure& task); |
| 358 void RunClosureOnSessionThread( | 354 void RunClosureOnSessionThread( |
| 359 const base::Closure& task, | 355 const base::Closure& task, |
| 360 base::WaitableEvent* done_event); | 356 base::WaitableEvent* done_event); |
| 361 void InitOnSessionThread(const Automation::BrowserOptions& options, | 357 void InitOnSessionThread(const Automation::BrowserOptions& options, |
| 362 Error** error); | 358 Error** error); |
| 363 void TerminateOnSessionThread(); | 359 void TerminateOnSessionThread(); |
| 364 | 360 |
| 365 // Executes the given |script| in the context of the given frame. | 361 // Executes the given |script| in the context of the given frame. |
| 366 // Waits for script to finish and parses the response. | 362 // Waits for script to finish and parses the response. |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 | 433 |
| 438 // Current state of all modifier keys. | 434 // Current state of all modifier keys. |
| 439 int sticky_modifiers_; | 435 int sticky_modifiers_; |
| 440 | 436 |
| 441 DISALLOW_COPY_AND_ASSIGN(Session); | 437 DISALLOW_COPY_AND_ASSIGN(Session); |
| 442 }; | 438 }; |
| 443 | 439 |
| 444 } // namespace webdriver | 440 } // namespace webdriver |
| 445 | 441 |
| 446 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ | 442 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ |
| OLD | NEW |