Chromium Code Reviews| Index: chrome/browser/resources/usb_internals/usb_internals.js |
| diff --git a/chrome/browser/resources/usb_internals/usb_internals.js b/chrome/browser/resources/usb_internals/usb_internals.js |
| index 1b324a4d4fdd70a0e04f14c7fd416b72a6a45ad7..28e3728b59b454aa579309e1035d5e1dd17abf05 100644 |
| --- a/chrome/browser/resources/usb_internals/usb_internals.js |
| +++ b/chrome/browser/resources/usb_internals/usb_internals.js |
| @@ -23,8 +23,8 @@ function refreshDeviceList() { |
| let remove = document.createElement('td'); |
| let removeButton = document.createElement('button'); |
| name.textContent = device.name; |
| - serialNumber.textContent = device.serial_number; |
| - landingPage.textContent = device.landing_page.url; |
| + serialNumber.textContent = device.serialNumber; |
| + landingPage.textContent = device.landingPage.url; |
| removeButton.addEventListener('click', function() { |
| pageHandler.removeDeviceForTesting(device.guid).then(refreshDeviceList); |
| }); |
| @@ -55,23 +55,14 @@ function addTestDevice(event) { |
| } |
| function initializeProxies() { |
| - return importModules([ |
| - 'chrome/browser/ui/webui/usb_internals/usb_internals.mojom', |
| - 'content/public/renderer/frame_interfaces', |
| - ]) |
| - .then(function(modules) { |
| - let mojom = modules[0]; |
| - let frameInterfaces = modules[1]; |
| - |
| - pageHandler = new mojom.UsbInternalsPageHandlerPtr( |
| - frameInterfaces.getInterface(mojom.UsbInternalsPageHandler.name)); |
| - }); |
| + pageHandler = new mojom.UsbInternalsPageHandlerPtr; |
| + Mojo.bindInterface( |
| + mojom.UsbInternalsPageHandler.name, mojo.makeRequest(pageHandler).handle); |
| } |
| document.addEventListener('DOMContentLoaded', function() { |
| - initializeProxies().then(function() { |
| - $('add-test-device-form').addEventListener('submit', addTestDevice); |
| - refreshDeviceList(); |
| - }); |
| + initializeProxies(); |
|
dpapad
2017/06/30 22:15:03
Nit: Can we inline the contents of initializeProxi
yzshen1
2017/06/30 22:37:31
Done.
|
| + $('add-test-device-form').addEventListener('submit', addTestDevice); |
| + refreshDeviceList(); |
| }); |
| })(); |