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

Unified Diff: chrome/browser/resources/inspect/inspect.js

Issue 22685003: Visualize status of port forwarding sockets in chrome:inspect Devices tab (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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
« no previous file with comments | « chrome/browser/resources/inspect/inspect.css ('k') | chrome/browser/ui/webui/inspect_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/inspect/inspect.js
diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resources/inspect/inspect.js
index 8ce04b8d6dee0dac7bfdec2a4dbb00aa045e4227..b98529302e817b9b647426ea21c9a4e6a1079930 100644
--- a/chrome/browser/resources/inspect/inspect.js
+++ b/chrome/browser/resources/inspect/inspect.js
@@ -113,9 +113,11 @@ function populateDeviceLists(devices) {
for (var d = 0; d < devices.length; d++) {
var device = devices[d];
+ var devicePorts;
var browserList;
var deviceSection = $(device.adbGlobalId);
if (deviceSection) {
+ devicePorts = deviceSection.querySelector('.device-ports');
browserList = deviceSection.querySelector('.browsers');
} else {
deviceSection = document.createElement('div');
@@ -124,10 +126,25 @@ function populateDeviceLists(devices) {
deviceList.appendChild(deviceSection);
var deviceHeader = document.createElement('div');
- deviceHeader.className = 'section';
- deviceHeader.textContent = device.adbModel;
+ deviceHeader.className = 'device-header';
deviceSection.appendChild(deviceHeader);
+ var deviceName = document.createElement('div');
+ deviceName.className = 'device-name';
+ deviceName.textContent = device.adbModel;
+ deviceHeader.appendChild(deviceName);
+
+ if (device.adbSerial) {
+ var deviceSerial = document.createElement('div');
+ deviceSerial.className = 'device-serial';
+ deviceSerial.textContent = '#' + device.adbSerial.toUpperCase();
+ deviceHeader.appendChild(deviceSerial);
+ }
+
+ devicePorts = document.createElement('div');
+ devicePorts.className = 'device-ports';
+ deviceHeader.appendChild(devicePorts);
+
browserList = document.createElement('div');
browserList.className = 'browsers';
deviceSection.appendChild(browserList);
@@ -136,6 +153,29 @@ function populateDeviceLists(devices) {
if (alreadyDisplayed(deviceSection, device))
continue;
+ devicePorts.textContent = '';
+ if (device.adbPortStatus) {
+ for (var port in device.adbPortStatus) {
+ var status = device.adbPortStatus[port];
+ var portIcon = document.createElement('div');
+ portIcon.className = 'port-icon';
+ if (status > 0)
+ portIcon.classList.add('connected');
+ else if (status == -1 || status == -2)
+ portIcon.classList.add('transient');
+ else if (status < 0)
+ portIcon.classList.add('error');
+ devicePorts.appendChild(portIcon);
+
+ var portNumber = document.createElement('div');
+ portNumber.className = 'port-number';
+ portNumber.textContent = ':' + port;
+ if (status > 0)
+ portNumber.textContent += '(' + status + ')';
+ devicePorts.appendChild(portNumber);
+ }
+ }
+
var newBrowserIds =
device.browsers.map(function(b) { return b.adbGlobalId });
Array.prototype.forEach.call(
@@ -149,7 +189,6 @@ function populateDeviceLists(devices) {
var browserSection = $(browser.adbGlobalId);
if (browserSection) {
pageList = browserSection.querySelector('.pages');
- pageList.textContent = '';
} else {
browserSection = document.createElement('div');
browserSection.id = browser.adbGlobalId;
@@ -157,7 +196,7 @@ function populateDeviceLists(devices) {
browserList.appendChild(browserSection);
var browserHeader = document.createElement('div');
- browserHeader.className = 'small-section';
+ browserHeader.className = 'browser-header';
browserHeader.textContent = browser.adbBrowserName;
browserSection.appendChild(browserHeader);
@@ -193,6 +232,7 @@ function populateDeviceLists(devices) {
if (alreadyDisplayed(browserSection, browser))
continue;
+ pageList.textContent = '';
for (var p = 0; p < browser.pages.length; p++) {
var page = browser.pages[p];
var row = addTargetToList(
« no previous file with comments | « chrome/browser/resources/inspect/inspect.css ('k') | chrome/browser/ui/webui/inspect_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698