Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / test / chromedriver / chrome / chrome_impl.cc

diff --git a/src/chrome/test/chromedriver/chrome/chrome_impl.cc b/src/chrome/test/chromedriver/chrome/chrome_impl.cc
index f293899..fc332d0 100644 (file)
--- a/src/chrome/test/chromedriver/chrome/chrome_impl.cc
+++ b/src/chrome/test/chromedriver/chrome/chrome_impl.cc
@@ -20,12 +20,8 @@ ChromeDesktopImpl* ChromeImpl::GetAsDesktop() {
   return NULL;
 }
 
-std::string ChromeImpl::GetVersion() {
-  return devtools_http_client_->version();
-}
-
-int ChromeImpl::GetBuildNo() {
-  return devtools_http_client_->build_no();
+const BrowserInfo* ChromeImpl::GetBrowserInfo() {
+  return devtools_http_client_->browser_info();
 }
 
 bool ChromeImpl::HasCrashedWebView() {
@@ -56,7 +52,7 @@ Status ChromeImpl::GetWebViewIds(std::list<std::string>* web_view_ids) {
   // Check for newly-opened web views.
   for (size_t i = 0; i < views_info.GetSize(); ++i) {
     const WebViewInfo& view = views_info.Get(i);
-    if (view.type != WebViewInfo::kPage)
+    if (view.type != WebViewInfo::kPage && view.type != WebViewInfo::kApp)
       continue;
 
     bool found = false;
@@ -77,7 +73,10 @@ Status ChromeImpl::GetWebViewIds(std::list<std::string>* web_view_ids) {
         // OnConnected will fire when DevToolsClient connects later.
       }
       web_views_.push_back(make_linked_ptr(new WebViewImpl(
-          view.id, GetBuildNo(), client.Pass())));
+          view.id,
+          devtools_http_client_->browser_info(),
+          client.Pass(),
+          devtools_http_client_->device_metrics())));
     }
   }
 
@@ -119,6 +118,10 @@ Status ChromeImpl::ActivateWebView(const std::string& id) {
   return devtools_http_client_->ActivateWebView(id);
 }
 
+bool ChromeImpl::IsMobileEmulationEnabled() const {
+  return false;
+}
+
 Status ChromeImpl::Quit() {
   Status status = QuitImpl();
   if (status.IsOk())
@@ -127,11 +130,13 @@ Status ChromeImpl::Quit() {
 }
 
 ChromeImpl::ChromeImpl(
-    scoped_ptr<DevToolsHttpClient> client,
+    scoped_ptr<DevToolsHttpClient> http_client,
+    scoped_ptr<DevToolsClient> websocket_client,
     ScopedVector<DevToolsEventListener>& devtools_event_listeners,
     scoped_ptr<PortReservation> port_reservation)
     : quit_(false),
-      devtools_http_client_(client.Pass()),
+      devtools_http_client_(http_client.Pass()),
+      devtools_websocket_client_(websocket_client.Pass()),
       port_reservation_(port_reservation.Pass()) {
   devtools_event_listeners_.swap(devtools_event_listeners);
 }