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

Side by Side Diff: chrome/browser/resources/bluetooth_internals/interfaces.js

Issue 2590393002: Revert of Mojo JS bindings: switch most usage of "connection"/"router" module to "bindings". (Closed)
Patch Set: Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * Javascript for Mojo interface helpers, served from 6 * Javascript for Mojo interface helpers, served from
7 * chrome://bluetooth-internals/. 7 * chrome://bluetooth-internals/.
8 */ 8 */
9 9
10 cr.define('interfaces', function() { 10 cr.define('interfaces', function() {
11 /** 11 /**
12 * Overriden by tests to give them a chance to setup a fake Mojo browser proxy 12 * Overriden by tests to give them a chance to setup a fake Mojo browser proxy
13 * before any other code executes. 13 * before any other code executes.
14 * @return {!Promise} A promise firing once necessary setup has been completed. 14 * @return {!Promise} A promise firing once necessary setup has been completed.
15 */ 15 */
16 var setupFn = window.setupFn || function() { return Promise.resolve(); }; 16 var setupFn = window.setupFn || function() { return Promise.resolve(); };
17 17
18 /** 18 /**
19 * Sets up Mojo interfaces and adds them to window.interfaces. 19 * Sets up Mojo interfaces and adds them to window.interfaces.
20 * @return {Promise} 20 * @return {Promise}
21 */ 21 */
22 function setupInterfaces() { 22 function setupInterfaces() {
23 return setupFn().then(function() { 23 return setupFn().then(function() {
24 return importModules([ 24 return importModules([
25 'content/public/renderer/frame_interfaces', 25 'content/public/renderer/frame_interfaces',
26 'device/bluetooth/public/interfaces/adapter.mojom', 26 'device/bluetooth/public/interfaces/adapter.mojom',
27 'device/bluetooth/public/interfaces/device.mojom', 27 'device/bluetooth/public/interfaces/device.mojom',
28 'mojo/public/js/bindings', 28 'mojo/public/js/bindings',
29 'mojo/public/js/connection',
29 ]).then(function([frameInterfaces, bluetoothAdapter, bluetoothDevice, 30 ]).then(function([frameInterfaces, bluetoothAdapter, bluetoothDevice,
30 bindings]) { 31 bindings, connection]) {
31 interfaces.BluetoothAdapter = bluetoothAdapter; 32 interfaces.BluetoothAdapter = bluetoothAdapter;
32 interfaces.BluetoothDevice = bluetoothDevice; 33 interfaces.BluetoothDevice = bluetoothDevice;
33 interfaces.Bindings = bindings; 34 interfaces.Bindings = bindings;
35 interfaces.Connection = connection;
34 interfaces.FrameInterfaces = frameInterfaces; 36 interfaces.FrameInterfaces = frameInterfaces;
35 }); 37 });
36 }); 38 });
37 } 39 }
38 40
39 return { 41 return {
40 setupInterfaces: setupInterfaces, 42 setupInterfaces: setupInterfaces,
41 }; 43 };
42 }); 44 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698