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

Unified Diff: chrome/test/chromedriver/session_commands.cc

Issue 2230053002: [chromedriver] Added option to make element references W3C compliant. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased code with w3c flag change. Created 4 years, 4 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_commands.cc
diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
index d8854720fb88328d8a51ba5f13cfde514ac5fcb7..90892e25b1205ca54f00f132bac14da3dc9e1055 100644
--- a/chrome/test/chromedriver/session_commands.cc
+++ b/chrome/test/chromedriver/session_commands.cc
@@ -202,14 +202,16 @@ Status InitSessionHelper(const InitSessionParams& bound_params,
bound_params.port_manager,
capabilities,
&devtools_event_listeners,
- &session->chrome);
+ &session->chrome,
+ session->w3c_compliant);
if (status.IsError())
return status;
session->chrome->set_page_load_strategy(capabilities.page_load_strategy);
std::list<std::string> web_view_ids;
- status = session->chrome->GetWebViewIds(&web_view_ids);
+ status = session->chrome->GetWebViewIds(&web_view_ids,
+ session->w3c_compliant);
if (status.IsError() || web_view_ids.empty()) {
return status.IsError() ? status :
Status(kUnknownError, "unable to discover open window in chrome");
@@ -282,7 +284,7 @@ Status ExecuteLaunchApp(Session* session,
return status;
AutomationExtension* extension = NULL;
- status = desktop->GetAutomationExtension(&extension);
+ status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
if (status.IsError())
return status;
@@ -293,7 +295,8 @@ Status ExecuteClose(Session* session,
const base::DictionaryValue& params,
std::unique_ptr<base::Value>* value) {
std::list<std::string> web_view_ids;
- Status status = session->chrome->GetWebViewIds(&web_view_ids);
+ Status status = session->chrome->GetWebViewIds(&web_view_ids,
+ session->w3c_compliant);
if (status.IsError())
return status;
bool is_last_web_view = web_view_ids.size() == 1u;
@@ -308,7 +311,8 @@ Status ExecuteClose(Session* session,
if (status.IsError())
return status;
- status = session->chrome->GetWebViewIds(&web_view_ids);
+ status = session->chrome->GetWebViewIds(&web_view_ids,
+ session->w3c_compliant);
if ((status.code() == kChromeNotReachable && is_last_web_view) ||
(status.IsOk() && web_view_ids.empty())) {
// If no window is open, close is the equivalent of calling "quit".
@@ -323,7 +327,8 @@ Status ExecuteGetWindowHandles(Session* session,
const base::DictionaryValue& params,
std::unique_ptr<base::Value>* value) {
std::list<std::string> web_view_ids;
- Status status = session->chrome->GetWebViewIds(&web_view_ids);
+ Status status = session->chrome->GetWebViewIds(&web_view_ids,
+ session->w3c_compliant);
if (status.IsError())
return status;
std::unique_ptr<base::ListValue> window_ids(new base::ListValue());
@@ -343,7 +348,8 @@ Status ExecuteSwitchToWindow(Session* session,
return Status(kUnknownError, "'name' must be a string");
std::list<std::string> web_view_ids;
- Status status = session->chrome->GetWebViewIds(&web_view_ids);
+ Status status = session->chrome->GetWebViewIds(&web_view_ids,
+ session->w3c_compliant);
if (status.IsError())
return status;
@@ -606,7 +612,8 @@ Status ExecuteSetNetworkConnection(Session* session,
// to ensure that network emulation is applied on a per-session basis
// rather than the just to the current WebView.
std::list<std::string> web_view_ids;
- status = session->chrome->GetWebViewIds(&web_view_ids);
+ status = session->chrome->GetWebViewIds(&web_view_ids,
+ session->w3c_compliant);
if (status.IsError())
return status;
@@ -630,7 +637,7 @@ Status ExecuteGetWindowPosition(Session* session,
return status;
AutomationExtension* extension = NULL;
- status = desktop->GetAutomationExtension(&extension);
+ status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
if (status.IsError())
return status;
@@ -660,7 +667,7 @@ Status ExecuteSetWindowPosition(Session* session,
return status;
AutomationExtension* extension = NULL;
- status = desktop->GetAutomationExtension(&extension);
+ status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
if (status.IsError())
return status;
@@ -676,7 +683,7 @@ Status ExecuteGetWindowSize(Session* session,
return status;
AutomationExtension* extension = NULL;
- status = desktop->GetAutomationExtension(&extension);
+ status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
if (status.IsError())
return status;
@@ -707,7 +714,7 @@ Status ExecuteSetWindowSize(Session* session,
return status;
AutomationExtension* extension = NULL;
- status = desktop->GetAutomationExtension(&extension);
+ status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
if (status.IsError())
return status;
@@ -724,7 +731,7 @@ Status ExecuteMaximizeWindow(Session* session,
return status;
AutomationExtension* extension = NULL;
- status = desktop->GetAutomationExtension(&extension);
+ status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
if (status.IsError())
return status;

Powered by Google App Engine
This is Rietveld 408576698