[DevTools] Skip WebView instances without open pages

chrome/browser/resources/inspect/inspect.js

 // 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.
 
 var MIN_VERSION_TAB_CLOSE = 25;
 var MIN_VERSION_TARGET_ID = 26;
 var MIN_VERSION_NEW_TAB = 29;
 var MIN_VERSION_TAB_ACTIVATE = 30;
 var WEBRTC_SERIAL = 'WEBRTC';
 
 var queryParamsObject = {};
+var browserInspector;
+var browserInspectorTitle;
 
 (function() {
 var queryParams = window.location.search;
 if (!queryParams)
     return;
 var params = queryParams.substring(1).split('&');
 for (var i = 0; i < params.length; ++i) {
     var pair = params[i].split('=');
     queryParamsObject[pair[0]] = pair[1];
 }
 
+if ('trace' in queryParamsObject || 'tracing' in queryParamsObject) {
+  browserInspector = 'chrome://tracing';
+  browserInspectorTitle = 'trace';
+} else {
+  browserInspector = queryParamsObject['browser-inspector'];
+  browserInspectorTitle = 'inspect';
+}
 })();
 
 function sendCommand(command, args) {
   chrome.send(command, Array.prototype.slice.call(arguments, 1));
 }
 
 function sendTargetCommand(command, target) {
   sendCommand(command, target.source, target.id);
 }
 
@@ skipping 93 matching lines @@
 }
 
 function alreadyDisplayed(element, data) {
   var json = JSON.stringify(data);
   if (element.cachedJSON == json)
     return true;
   element.cachedJSON = json;
   return false;
 }
 
+function updateBrowserVisibility(browserSection) {
+  var icon = browserSection.querySelector('.used-for-port-forwarding');
+  browserSection.hidden = !browserSection.querySelector('.open') &&
+                          !browserSection.querySelector('.row') &&
+                          !browserInspector &&
+                          (!icon || icon.hidden);
+}
+
 function populateRemoteTargets(devices) {
   if (!devices)
     return;
 
   if (window.modal) {
     window.holdDevices = devices;
     return;
   }
 
   function insertChildSortedById(parent, child) {
@@ skipping 143 matching lines @@
 
         if (incompatibleVersion) {
           var warningSection = document.createElement('div');
           warningSection.className = 'warning';
           warningSection.textContent =
             'You may need a newer version of desktop Chrome. ' +
             'Please try Chrome ' + browser.adbBrowserVersion + ' or later.';
           browserSection.appendChild(warningSection);
         }
 
-        var browserInspector;
-        var browserInspectorTitle;
-        if ('trace' in queryParamsObject || 'tracing' in queryParamsObject) {
-          browserInspector = 'chrome://tracing';
-          browserInspectorTitle = 'trace';
-        } else {
-          browserInspector = queryParamsObject['browser-inspector'];
-          browserInspectorTitle = 'inspect';
-        }
         if (browserInspector) {
           var link = document.createElement('span');
           link.classList.add('action');
           link.setAttribute('tabindex', 1);
           link.textContent = browserInspectorTitle;
           browserHeader.appendChild(link);
           link.addEventListener(
               'click',
               sendCommand.bind(null, 'inspect-browser', browser.source,
                   browser.id, browserInspector), false);
         }
 
         pageList = document.createElement('div');
         pageList.className = 'list pages';
         browserSection.appendChild(pageList);
       }
 
-      if (incompatibleVersion || alreadyDisplayed(browserSection, browser))
-        continue;
-
-      pageList.textContent = '';
-      for (var p = 0; p < browser.pages.length; p++) {
-        var page = browser.pages[p];
-        // Attached targets have no unique id until Chrome 26. For such targets
-        // it is impossible to activate existing DevTools window.
-        page.hasNoUniqueId = page.attached &&
-            (majorChromeVersion && majorChromeVersion < MIN_VERSION_TARGET_ID);
-        var row = addTargetToList(page, pageList, ['name', 'url']);
-        if (page['description'])
-          addWebViewDetails(row, page);
-        else
-          addFavicon(row, page);
-        if (majorChromeVersion >= MIN_VERSION_TAB_ACTIVATE) {
-          addActionLink(row, 'focus tab',
-              sendTargetCommand.bind(null, 'activate', page), false);
-        }
-        if (majorChromeVersion) {
-          addActionLink(row, 'reload',
-              sendTargetCommand.bind(null, 'reload', page), page.attached);
-        }
-        if (majorChromeVersion >= MIN_VERSION_TAB_CLOSE) {
-          addActionLink(row, 'close',
-              sendTargetCommand.bind(null, 'close', page), false);
+      if (!incompatibleVersion && !alreadyDisplayed(browserSection, browser)) {
+        pageList.textContent = '';
+        for (var p = 0; p < browser.pages.length; p++) {
+          var page = browser.pages[p];
+          // Attached targets have no unique id until Chrome 26. For such
+          // targets it is impossible to activate existing DevTools window.
+          page.hasNoUniqueId = page.attached &&
+              majorChromeVersion && majorChromeVersion < MIN_VERSION_TARGET_ID;
+          var row = addTargetToList(page, pageList, ['name', 'url']);
+          if (page['description'])
+            addWebViewDetails(row, page);
+          else
+            addFavicon(row, page);
+          if (majorChromeVersion >= MIN_VERSION_TAB_ACTIVATE) {
+            addActionLink(row, 'focus tab',
+                sendTargetCommand.bind(null, 'activate', page), false);
+          }
+          if (majorChromeVersion) {
+            addActionLink(row, 'reload',
+                sendTargetCommand.bind(null, 'reload', page), page.attached);
+          }
+          if (majorChromeVersion >= MIN_VERSION_TAB_CLOSE) {
+            addActionLink(row, 'close',
+                sendTargetCommand.bind(null, 'close', page), false);
+          }
         }
       }
+      updateBrowserVisibility(browserSection);
     }
   }
 }
 
 function addToPagesList(data) {
   var row = addTargetToList(data, $('pages-list'), ['name', 'url']);
   addFavicon(row, data);
   if (data.guests)
     addGuestViews(row, data.guests);
 }
@@ skipping 540 matching lines @@
       portNumber.textContent = ':' + port;
       if (status > 0)
         portNumber.textContent += '(' + status + ')';
       devicePorts.appendChild(portNumber);
     }
 
     function updatePortForwardingInfo(browserSection) {
       var icon = browserSection.querySelector('.used-for-port-forwarding');
       if (icon)
         icon.hidden = (browserSection.id !== deviceStatus.browserId);
+      updateBrowserVisibility(browserSection);
     }
 
     Array.prototype.forEach.call(
         deviceSection.querySelectorAll('.browser'), updatePortForwardingInfo);
   }
 
   function clearPorts(deviceSection) {
     if (deviceSection.id in devicesStatusMap)
       return;
     deviceSection.querySelector('.device-ports').textContent = '';
   }
 
   Array.prototype.forEach.call(
       document.querySelectorAll('.device'), clearPorts);
 }
 
 document.addEventListener('DOMContentLoaded', onload);
 
 window.addEventListener('hashchange', onHashChange);