[chromedriver] When launching a Chrome App, automatically switch to the new window.

chrome/test/chromedriver/chrome/chrome_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/chrome/chrome_impl.h"
 
+#include "base/bind.h"
 #include "chrome/test/chromedriver/chrome/devtools_client.h"
 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
 #include "chrome/test/chromedriver/chrome/devtools_http_client.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/web_view_impl.h"
 #include "chrome/test/chromedriver/net/port_server.h"
 
+namespace {
+
+void DoNothingWithWebViewInfo(const WebViewInfo& view) {
+}
+
+}  // namespace
+
 ChromeImpl::~ChromeImpl() {
   if (!quit_)
     port_reservation_->Leak();
 }
 
 Status ChromeImpl::GetAsDesktop(ChromeDesktopImpl** desktop) {
   return Status(kUnknownError, "operation unsupported");
 }
 
 const BrowserInfo* ChromeImpl::GetBrowserInfo() const {
   return devtools_http_client_->browser_info();
 }
 
 bool ChromeImpl::HasCrashedWebView() {
   for (WebViewList::iterator it = web_views_.begin();
        it != web_views_.end(); ++it) {
     if ((*it)->WasCrashed())
       return true;
   }
   return false;
 }
 
 Status ChromeImpl::GetWebViewIds(std::list<std::string>* web_view_ids) {
+  WebViewCallback callback = base::Bind(&DoNothingWithWebViewInfo);
+  return UpdateWebViewIds(web_view_ids, callback);
+}
+
+Status ChromeImpl::UpdateWebViewIds(std::list<std::string>* web_view_ids,
+                                    const WebViewCallback& on_open_web_view) {
   WebViewsInfo views_info;
   Status status = devtools_http_client_->GetWebViewsInfo(&views_info);
   if (status.IsError())
     return status;
 
   // Check if some web views are closed.
   WebViewList::iterator it = web_views_.begin();
   while (it != web_views_.end()) {
     if (!views_info.GetForId((*it)->GetId())) {
       it = web_views_.erase(it);
@@ skipping 25 matching lines @@
                  devtools_event_listeners_.begin();
              listener != devtools_event_listeners_.end(); ++listener) {
           client->AddListener(*listener);
           // OnConnected will fire when DevToolsClient connects later.
         }
         web_views_.push_back(make_linked_ptr(new WebViewImpl(
             view.id,
             devtools_http_client_->browser_info(),
             client.Pass(),
             devtools_http_client_->device_metrics())));
+        on_open_web_view.Run(view);
       }
     }
   }
 
   std::list<std::string> web_view_ids_tmp;
   for (WebViewList::const_iterator web_view_iter = web_views_.begin();
        web_view_iter != web_views_.end(); ++web_view_iter) {
     web_view_ids_tmp.push_back((*web_view_iter)->GetId());
   }
   web_view_ids->swap(web_view_ids_tmp);
@@ skipping 48 matching lines @@
     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_(http_client.Pass()),
       devtools_websocket_client_(websocket_client.Pass()),
       port_reservation_(port_reservation.Pass()) {
   devtools_event_listeners_.swap(devtools_event_listeners);
 }