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

Unified Diff: chrome/test/chromedriver/session.h

Issue 12764021: [chromedriver] Support clicking an element in sub frames. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/chromedriver/session.h
diff --git a/chrome/test/chromedriver/session.h b/chrome/test/chromedriver/session.h
index f7bc2e2cb1c3b401b0041fe906ca0788f4fe19c6..a8f03efafddd3f499ebfca909fed2cfc1988ce77 100644
--- a/chrome/test/chromedriver/session.h
+++ b/chrome/test/chromedriver/session.h
@@ -5,6 +5,7 @@
#ifndef CHROME_TEST_CHROMEDRIVER_SESSION_H_
#define CHROME_TEST_CHROMEDRIVER_SESSION_H_
+#include <list>
#include <string>
#include "base/basictypes.h"
@@ -21,6 +22,16 @@ class Chrome;
class Status;
class WebView;
+struct FrameElement {
kkania 2013/03/13 00:06:20 actually, i think FrameInfo is better than FrameEl
chrisgao (Use stgao instead) 2013/03/13 00:36:48 Ok, take FrameInfo.
+ FrameElement(const std::string& parent_frame_id,
+ const std::string& frame_id,
+ const std::string& chromedriver_frame_id);
+
+ std::string parent_frame_id;
+ std::string frame_id;
+ std::string chromedriver_frame_id;
+};
+
struct Session {
explicit Session(const std::string& id);
Session(const std::string& id, scoped_ptr<Chrome> chrome);
@@ -28,10 +39,18 @@ struct Session {
Status GetTargetWindow(WebView** web_view);
+ void SwitchToTopFrame();
+ void SwitchToSubFrame(const std::string& frame_id,
+ const std::string& chromedriver_frame_id);
+ std::string GetCurrentFrameId() const;
+
const std::string id;
scoped_ptr<Chrome> chrome;
std::string window;
- std::string frame;
+ // List of |FrameElement|s for each frame to the current target frame from the
+ // first frame element in the root document. If target frame is window.top,
+ // this list will be empty.
+ std::list<FrameElement> frame_elements;
WebPoint mouse_position;
int implicit_wait;
int page_load_timeout;

Powered by Google App Engine
This is Rietveld 408576698