Commit 3c18d31f authored by Giovanni Ortuño Urquidi's avatar Giovanni Ortuño Urquidi Committed by Commit Bot

mojo: add-supervision: Use new bindings names in add supervision webui

Mojo JS Lite Bindings were recently renamed to align with the new C++
names. This CL changes usage of the old names with the new ones. See
bug for more details.

Bug: 968369
Change-Id: If7ea7b08af65702c7c972f2e10bd1fa290587306
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1705890
Commit-Queue: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683377}
parent aa9f4c85
...@@ -33,7 +33,8 @@ function isAllowedRequest(requestDetails) { ...@@ -33,7 +33,8 @@ function isAllowedRequest(requestDetails) {
} }
let server = null; let server = null;
const proxy = addSupervision.mojom.AddSupervisionHandler.getProxy(); const addSupervisionHandler =
addSupervision.mojom.AddSupervisionHandler.getRemote();
Polymer({ Polymer({
is: 'add-supervision-ui', is: 'add-supervision-ui',
...@@ -62,7 +63,7 @@ Polymer({ ...@@ -62,7 +63,7 @@ Polymer({
this.offlineContentDiv.hidden = false; this.offlineContentDiv.hidden = false;
}); });
proxy.getOAuthToken().then((result) => { addSupervisionHandler.getOAuthToken().then((result) => {
const webviewUrl = loadTimeData.getString('webviewUrl'); const webviewUrl = loadTimeData.getString('webviewUrl');
const eventOriginFilter = loadTimeData.getString('eventOriginFilter'); const eventOriginFilter = loadTimeData.getString('eventOriginFilter');
const webview = const webview =
......
...@@ -28,7 +28,8 @@ class AddSupervisionAPIServer extends PostMessageAPIServer { ...@@ -28,7 +28,8 @@ class AddSupervisionAPIServer extends PostMessageAPIServer {
constructor(webviewElement, targetURL, originURLPrefix) { constructor(webviewElement, targetURL, originURLPrefix) {
super(webviewElement, METHOD_LIST, targetURL, originURLPrefix); super(webviewElement, METHOD_LIST, targetURL, originURLPrefix);
this.proxy_ = addSupervision.mojom.AddSupervisionHandler.getProxy(); this.addSupervisionHandler_ =
addSupervision.mojom.AddSupervisionHandler.getRemote();
this.registerMethod('logOut', this.logOut.bind(this)); this.registerMethod('logOut', this.logOut.bind(this));
this.registerMethod( this.registerMethod(
...@@ -43,7 +44,7 @@ class AddSupervisionAPIServer extends PostMessageAPIServer { ...@@ -43,7 +44,7 @@ class AddSupervisionAPIServer extends PostMessageAPIServer {
* @param {!Array} unused Placeholder unused empty parameter. * @param {!Array} unused Placeholder unused empty parameter.
*/ */
logOut(unused) { logOut(unused) {
return this.proxy_.logOut(); return this.addSupervisionHandler_.logOut();
} }
/** /**
...@@ -54,7 +55,7 @@ class AddSupervisionAPIServer extends PostMessageAPIServer { ...@@ -54,7 +55,7 @@ class AddSupervisionAPIServer extends PostMessageAPIServer {
* apps installed on the device. * apps installed on the device.
*/ */
getInstalledArcApps(unused) { getInstalledArcApps(unused) {
return this.proxy_.getInstalledArcApps(); return this.addSupervisionHandler_.getInstalledArcApps();
} }
/** /**
...@@ -67,7 +68,7 @@ class AddSupervisionAPIServer extends PostMessageAPIServer { ...@@ -67,7 +68,7 @@ class AddSupervisionAPIServer extends PostMessageAPIServer {
* resolve with boolean result indicating whether the dialog was closed. * resolve with boolean result indicating whether the dialog was closed.
*/ */
requestClose(unused) { requestClose(unused) {
return this.proxy_.requestClose(); return this.addSupervisionHandler_.requestClose();
} }
/** /**
...@@ -75,6 +76,6 @@ class AddSupervisionAPIServer extends PostMessageAPIServer { ...@@ -75,6 +76,6 @@ class AddSupervisionAPIServer extends PostMessageAPIServer {
* @param {!Array} unused Placeholder unused empty parameter. * @param {!Array} unused Placeholder unused empty parameter.
*/ */
notifySupervisionEnabled(unused) { notifySupervisionEnabled(unused) {
return this.proxy_.notifySupervisionEnabled(); return this.addSupervisionHandler_.notifySupervisionEnabled();
} }
} }
...@@ -8,7 +8,4 @@ mojom("mojo_bindings") { ...@@ -8,7 +8,4 @@ mojom("mojo_bindings") {
sources = [ sources = [
"add_supervision.mojom", "add_supervision.mojom",
] ]
# TODO(https://crbug.com/968369): Change to use new names.
use_old_js_lite_bindings_names = true
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment