Commit 9c40559f authored by Jeevan Shikaram's avatar Jeevan Shikaram Committed by Commit Bot

[App Management] Follow up fixes to permission item.

This CL follows up crrev.com/c/1784238 with few naming and console
error fixes.

Bug: 999896
Change-Id: Ic053db94e250aebd38105ace7e895c468d3d30c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1798255Reviewed-by: default avatarAlan Cutter <alancutter@chromium.org>
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699209}
parent 2e7fb209
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
elements should import the icon-set needed for the specified |icon|. --> elements should import the icon-set needed for the specified |icon|. -->
<template is="dom-if" if="[[available_]]"> <template is="dom-if" if="[[available_]]">
<app-management-toggle-row <app-management-toggle-row
id="toggleRow" id="toggle-row"
icon="[[icon]]" icon="[[icon]]"
label="[[permissionLabel]]" label="[[permissionLabel]]"
managed="[[isManaged_(app_, permissionType)]]" managed="[[isManaged_(app_, permissionType)]]"
......
...@@ -86,13 +86,14 @@ Polymer({ ...@@ -86,13 +86,14 @@ Polymer({
* @return {boolean} * @return {boolean}
*/ */
isManaged_: function(app, permissionType) { isManaged_: function(app, permissionType) {
if (app === undefined || permissionType === undefined) { if (app === undefined || permissionType === undefined ||
!this.isAvailable_(app, permissionType)) {
return false; return false;
} }
assert(app); assert(app);
const permission = app_management.util.getPermission(app, permissionType); const permission = app_management.util.getPermission(app, permissionType);
assert(permission); assert(permission);
return permission.isManaged; return permission.isManaged;
}, },
...@@ -116,7 +117,7 @@ Polymer({ ...@@ -116,7 +117,7 @@ Polymer({
* @private * @private
*/ */
onClick_: function() { onClick_: function() {
this.root.querySelector('#toggleRow').click(); this.$$('#toggle-row').click();
}, },
/** /**
......
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