[chromedriver] Include extension popups in list of windows

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 "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"
@@ skipping 34 matching lines @@
     if (!views_info.GetForId((*it)->GetId())) {
       it = web_views_.erase(it);
     } else {
       ++it;
     }
   }
 
   // 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 && view.type != WebViewInfo::kApp)
-      continue;
-
-    bool found = false;
-    for (WebViewList::const_iterator web_view_iter = web_views_.begin();
-         web_view_iter != web_views_.end(); ++web_view_iter) {
-      if ((*web_view_iter)->GetId() == view.id) {
-        found = true;
-        break;
+    if (view.type == WebViewInfo::kPage ||
+        view.type == WebViewInfo::kApp ||
+        (view.type == WebViewInfo::kOther &&
+         view.url.find("chrome-extension://") == 0)) {
+      bool found = false;
+      for (WebViewList::const_iterator web_view_iter = web_views_.begin();
+           web_view_iter != web_views_.end(); ++web_view_iter) {
+        if ((*web_view_iter)->GetId() == view.id) {
+          found = true;
+          break;
+        }
       }
-    }
-    if (!found) {
-      scoped_ptr<DevToolsClient> client(
-          devtools_http_client_->CreateClient(view.id));
-      for (ScopedVector<DevToolsEventListener>::const_iterator listener =
-               devtools_event_listeners_.begin();
-           listener != devtools_event_listeners_.end(); ++listener) {
-        client->AddListener(*listener);
-        // OnConnected will fire when DevToolsClient connects later.
+      if (!found) {
+        scoped_ptr<DevToolsClient> client(
+            devtools_http_client_->CreateClient(view.id));
+        for (ScopedVector<DevToolsEventListener>::const_iterator listener =
+                 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())));
       }
-      web_views_.push_back(make_linked_ptr(new WebViewImpl(
-          view.id,
-          devtools_http_client_->browser_info(),
-          client.Pass(),
-          devtools_http_client_->device_metrics())));
     }
   }
 
   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);
   return Status(kOk);
@@ skipping 43 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);
 }