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

Side by Side Diff: content/test/data/web_ui_mojo_shell_test.js

Issue 1764253002: Rename shell.mojom to connector.mojom, ApplicationManager to Shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@32exe
Patch Set: . Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « content/renderer/usb/web_usb_device_impl.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 /** 6 /**
7 * This URL is defined in content/public/test/test_mojo_app.cc. It identifies 7 * This URL is defined in content/public/test/test_mojo_app.cc. It identifies
8 * content_shell's out-of-process Mojo test app. 8 * content_shell's out-of-process Mojo test app.
9 */ 9 */
10 var TEST_APP_URL = 'system:content_mojo_test'; 10 var TEST_APP_URL = 'system:content_mojo_test';
11 11
12 12
13 define('main', [ 13 define('main', [
14 'mojo/public/js/core', 14 'mojo/public/js/core',
15 'mojo/public/js/router', 15 'mojo/public/js/router',
16 'mojo/services/network/public/interfaces/url_loader.mojom', 16 'mojo/services/network/public/interfaces/url_loader.mojom',
17 'mojo/shell/public/interfaces/shell.mojom', 17 'mojo/shell/public/interfaces/connector.mojom',
18 'content/public/renderer/service_provider', 18 'content/public/renderer/service_provider',
19 'content/public/test/test_mojo_service.mojom', 19 'content/public/test/test_mojo_service.mojom',
20 ], function (core, router, urlMojom, shellMojom, serviceRegistry, testMojom) { 20 ], function (core, router, urlMojom, connectorMojom, serviceRegistry,
21 testMojom) {
21 22
22 var connectToService = function(serviceProvider, iface) { 23 var connectToService = function(serviceProvider, iface) {
23 var pipe = core.createMessagePipe(); 24 var pipe = core.createMessagePipe();
24 var service = new iface.proxyClass(new router.Router(pipe.handle0)); 25 var service = new iface.proxyClass(new router.Router(pipe.handle0));
25 serviceProvider.getInterface(iface.name, pipe.handle1); 26 serviceProvider.getInterface(iface.name, pipe.handle1);
26 return service; 27 return service;
27 }; 28 };
28 29
29 return function() { 30 return function() {
30 domAutomationController.setAutomationId(0); 31 domAutomationController.setAutomationId(0);
31 var connectorPipe = 32 var connectorPipe =
32 serviceRegistry.connectToService(shellMojom.Connector.name); 33 serviceRegistry.connectToService(connectorMojom.Connector.name);
33 var connector = new shellMojom.Connector.proxyClass( 34 var connector = new connectorMojom.Connector.proxyClass(
34 new router.Router(connectorPipe)); 35 new router.Router(connectorPipe));
35 36
36 connector.connect( 37 connector.connect(
37 TEST_APP_URL, 1, 38 TEST_APP_URL, 1,
38 function (services) { 39 function (services) {
39 var test = connectToService(services, testMojom.TestMojoService); 40 var test = connectToService(services, testMojom.TestMojoService);
40 test.getRequestorName().then(function(response) { 41 test.getRequestorName().then(function(response) {
41 domAutomationController.send( 42 domAutomationController.send(
42 response.name == 'chrome://mojo-web-ui/'); 43 response.name == 'chrome://mojo-web-ui/');
43 }); 44 });
44 }, 45 },
45 function (exposedServices) {}); 46 function (exposedServices) {});
46 }; 47 };
47 }); 48 });
OLDNEW
« no previous file with comments | « content/renderer/usb/web_usb_device_impl.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698