diff options
author | dgozman <dgozman@chromium.org> | 2015-12-22 13:08:59 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-22 21:10:47 +0000 |
commit | f90eba63c122f8d1e1ef01627053c58da32d9de9 (patch) | |
tree | 9bff366f3ddd70c3f5b0cdedb099b901fa3cd4ad | |
parent | f66cea118466da0e03ea724c93f5671109be7ba3 (diff) | |
download | chromium_src-f90eba63c122f8d1e1ef01627053c58da32d9de9.zip chromium_src-f90eba63c122f8d1e1ef01627053c58da32d9de9.tar.gz chromium_src-f90eba63c122f8d1e1ef01627053c58da32d9de9.tar.bz2 |
[DevTools] Fix UI in Inspect Devices, filter out experimental webrtc.
BUG=565231,571208
Review URL: https://codereview.chromium.org/1544743005
Cr-Commit-Position: refs/heads/master@{#366649}
-rw-r--r-- | third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js | 4 | ||||
-rw-r--r-- | third_party/WebKit/Source/devtools/front_end/devices/devicesView.css | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js b/third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js index 600e87e..7f09b2c 100644 --- a/third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js +++ b/third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js @@ -12,7 +12,7 @@ WebInspector.DevicesView = function() this.registerRequiredCSS("devices/devicesView.css"); this.contentElement.classList.add("devices-view"); - var hbox = this.contentElement.createChild("div", "hbox flex-auto"); + var hbox = this.contentElement.createChild("div", "hbox devices-container"); var sidebar = hbox.createChild("div", "devices-sidebar"); sidebar.createChild("div", "devices-view-title").createTextChild(WebInspector.UIString("Devices")); this._sidebarList = sidebar.createChild("div", "devices-sidebar-list"); @@ -74,7 +74,7 @@ WebInspector.DevicesView.prototype = { */ _devicesUpdated: function(event) { - this._devices = /** @type {!Array.<!Adb.Device>} */ (event.data).slice(); + this._devices = /** @type {!Array.<!Adb.Device>} */ (event.data).slice().filter(d => d.adbSerial.toUpperCase() !== "WEBRTC"); for (var device of this._devices) { if (!device.adbConnected) device.adbModel = WebInspector.UIString("Unknown"); diff --git a/third_party/WebKit/Source/devtools/front_end/devices/devicesView.css b/third_party/WebKit/Source/devtools/front_end/devices/devicesView.css index 144683d..e9930d6 100644 --- a/third_party/WebKit/Source/devtools/front_end/devices/devicesView.css +++ b/third_party/WebKit/Source/devtools/front_end/devices/devicesView.css @@ -8,6 +8,11 @@ padding-top: 15px; } +.devices-container { + overflow: hidden; + flex: auto; +} + .devices-sidebar { flex: 0 0 150px; display: flex; |