Chromium Code Reviews| Index: chrome/test/webdriver/session.h |
| diff --git a/chrome/test/webdriver/session.h b/chrome/test/webdriver/session.h |
| index 222823c24a4697f305065a251800038d07669368..f361abecadc02eeaf594829b66016569269e425b 100644 |
| --- a/chrome/test/webdriver/session.h |
| +++ b/chrome/test/webdriver/session.h |
| @@ -80,7 +80,6 @@ class Session { |
| void MouseClick(const gfx::Point& click, int flags); |
| bool MouseMove(const gfx::Point& location); |
| bool MouseDrag(const gfx::Point& start, const gfx::Point& end); |
| - |
| bool NavigateToURL(const std::string& url); |
| bool GoForward(); |
| bool GoBack(); |
| @@ -93,6 +92,8 @@ class Session { |
| std::string* cookie); |
| bool DeleteCookie(const GURL& url, const std::string& cookie_name); |
| bool SetCookie(const GURL& url, const std::string& cookie); |
| + bool CaptureEntirePageAsPNG(const FilePath& path); |
| + bool ScreenshotAsBase64(std::string* screenshot); |
| // Gets all the currently existing window IDs. Returns true on success. |
| bool GetWindowIds(std::vector<int>* window_ids); |
| @@ -147,28 +148,19 @@ class Session { |
| // Waits for all tabs to stop loading. Returns true on success. |
| bool WaitForAllTabsToStopLoading(); |
| - inline const std::string& id() const { return id_; } |
| - |
| - inline int implicit_wait() const { return implicit_wait_; } |
| - inline void set_implicit_wait(const int& timeout) { |
| - implicit_wait_ = timeout > 0 ? timeout : 0; |
| - } |
| + std::string Id() const; |
| - enum Speed { kSlow, kMedium, kFast, kUnknown }; |
| - inline Speed speed() { return speed_; } |
| - inline void set_speed(Speed speed) { |
| - speed_ = speed; |
| - } |
| + int ImplicitWait() const; |
| + void SetImplicitWait(const int& timeout); |
|
Paweł Hajdan Jr.
2011/03/03 14:43:42
nit: Just int timeout.
|
| - inline const std::string& current_frame_xpath() const { |
| - return current_frame_xpath_; |
| - } |
| + enum InputSpeed { kSlow, kMedium, kFast, kUnknown }; |
| + Session::InputSpeed Speed() const; |
| + void SetSpeed(const InputSpeed& speed); |
| - inline void set_current_frame_xpath(const std::string& xpath) { |
| - current_frame_xpath_ = xpath; |
| - } |
| + std::string CurrentFrameXPath() const; |
| + void SetCurrentFrameXPath(const std::string& xpath); |
| - inline int current_window_id() const { return current_window_id_; } |
| + int CurrentWindowId() const; |
| private: |
| void RunSessionTask(Task* task); |
| @@ -200,7 +192,7 @@ class Session { |
| base::Thread thread_; |
| int implicit_wait_; |
| - Speed speed_; |
| + InputSpeed speed_; |
| // The XPath to the frame within this session's active tab which all |
| // commands should be directed to. XPath strings can represent a frame deep |