Sending known policy names for extensions to chrome://policy page

chrome/browser/resources/policy.js

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('policy', function() {
   /**
    * A box that shows the status of cloud policy for a device or user.
    * @constructor
    * @extends {HTMLFieldSetElement}
    */
@@ skipping 70 matching lines @@
       this.querySelector('.toggle-expanded-value').addEventListener(
           'click', this.toggleExpandedValue_.bind(this));
     },
 
     /**
      * Populate the table columns with information about the policy name, value
      * and status.
      * @param {string} name The policy name.
      * @param {Object} value Dictionary with information about the policy value.
      * @param {boolean} unknown Whether the policy name is not recognized.
-     * @param {boolean} includeStatus Whether the table has a status column.
      */
-    initialize: function(name, value, unknown, includeStatus) {
+    initialize: function(name, value, unknown) {
       this.name = name;
       this.unset = !value;
 
       // Populate the name column.
       this.querySelector('.name').textContent = name;
 
       // Populate the remaining columns with policy scope, level and value if a
       // value has been set. Otherwise, leave them blank.
       if (value) {
         this.querySelector('.scope').textContent =
             loadTimeData.getString(value.scope == 'user' ?
                 'scopeUser' : 'scopeDevice');
         this.querySelector('.level').textContent =
             loadTimeData.getString(value.level == 'recommended' ?
                 'levelRecommended' : 'levelMandatory');
         this.querySelector('.value').textContent = value.value;
         this.querySelector('.expanded-value').textContent = value.value;
       }
 
-      if (includeStatus) {
-        // Populate the status column.
-        var status;
-        if (!value) {
-          // If the policy value has not been set, show an error message.
-          status = loadTimeData.getString('unset');
-        } else if (unknown) {
-          // If the policy name is not recognized, show an error message.
-          status = loadTimeData.getString('unknown');
-        } else if (value.error) {
-          // If an error occurred while parsing the policy value, show the error
-          // message.
-          status = value.error;
-        } else {
-          // Otherwise, indicate that the policy value was parsed correctly.
-          status = loadTimeData.getString('ok');
-        }
-        this.querySelector('.status').textContent = status;
+      // Populate the status column.
+      var status;
+      if (!value) {
+        // If the policy value has not been set, show an error message.
+        status = loadTimeData.getString('unset');
+      } else if (unknown) {
+        // If the policy name is not recognized, show an error message.
+        status = loadTimeData.getString('unknown');
+      } else if (value.error) {
+        // If an error occurred while parsing the policy value, show the error
+        // message.
+        status = value.error;
       } else {
-        // Remove status column.
-        this.querySelector('.status-container').remove();
-        this.querySelector('.expanded-value').setAttribute('colspan', 4);
+        // Otherwise, indicate that the policy value was parsed correctly.
+        status = loadTimeData.getString('ok');
       }
+      this.querySelector('.status').textContent = status;
     },
 
     /**
      * Check the table columns for overflow. Most columns are automatically
      * elided when overflow occurs. The only action required is to add a tooltip
      * that shows the complete content. The value column is an exception. If
      * overflow occurs here, the contents is replaced with a link that toggles
      * the visibility of an additional row containing the complete value.
      */
     checkOverflow: function() {
@@ skipping 154 matching lines @@
 
     /**
      * Add a policy with the given |name| and |value| to the table.
      * @param {string} name The policy name.
      * @param {Object} value Dictionary with information about the policy value.
      * @param {boolean} unknown Whether the policy name is not recoginzed.
      * @private
      */
     setPolicyValue_: function(name, value, unknown) {
       var policy = new Policy;
-      var includeStatus = this.querySelector('.status-column') != null;
-      policy.initialize(name, value, unknown, includeStatus);
+      policy.initialize(name, value, unknown);
       this.appendChild(policy);
     },
   };
 
   /**
    * A singelton object that handles communication between browser and WebUI.
    * @constructor
    */
   function Page() {
   }
 
   // Make Page a singleton.
   cr.addSingletonGetter(Page);
 
   /**
    * Provide a list of all known policies to the UI. Called by the browser on
    * page load.
    * @param {Object} names Dictionary containing all known policy names.
    */
   Page.setPolicyNames = function(names) {
-    var table = this.getInstance().policyTables['chrome'];
-    table.setPolicyNames(names);
+    var page = this.getInstance();
+
+    // Clear all policy tables.
+    page.mainSection.innerHTML = '';
+    page.policyTables = {};
+
+    // Create tables and set known policy names for Chrome and extensions.
+    if (names.hasOwnProperty('chromePolicyNames')) {
+      var table = page.appendNewTable('chrome', 'Chrome policies', '');
+      table.setPolicyNames(names.chromePolicyNames);
+    }
+    if (names.hasOwnProperty('extensionPolicyNames')) {
+      for (var ext in names.extensionPolicyNames) {
+        var table = page.appendNewTable('extension-' + ext,
+            names.extensionPolicyNames[ext].name, 'ID: ' + ext);
+        table.setPolicyNames(names.extensionPolicyNames[ext].policyNames);
+      }
+    }
   };
 
   /**
    * Provide a list of the currently set policy values and any errors detected
    * while parsing these to the UI. Called by the browser on page load and
    * whenever policy values change.
    * @param {Object} values Dictionary containing the current policy values.
    */
   Page.setPolicyValues = function(values) {
     var page = this.getInstance();
-
     if (values.hasOwnProperty('chromePolicies')) {
       var table = page.policyTables['chrome'];
       table.setPolicyValues(values.chromePolicies);
     }
 
     if (values.hasOwnProperty('extensionPolicies')) {
       for (var extensionId in values.extensionPolicies) {
-        var tableName = values.extensionPolicies[extensionId].name;
-        var table = page.getOrCreateTable('extension-' + extensionId, tableName,
-                                          'ID: ' + extensionId, false);
-        table.setPolicyValues(values.extensionPolicies[extensionId].policies);
+        var table = page.policyTables['extension-' + extensionId];
+        if (table)
+          table.setPolicyValues(values.extensionPolicies[extensionId]);
       }
     }
   };
 
   /**
    * Provide the current cloud policy status to the UI. Called by the browser on
    * page load if cloud policy is present and whenever the status changes.
    * @param {Object} status Dictionary containing the current policy status.
    */
   Page.setStatus = function(status) {
@@ skipping 10 matching lines @@
 
   Page.prototype = {
     /**
      * Main initialization function. Called by the browser on page load.
      */
     initialize: function() {
       uber.onContentFrameLoaded();
 
       this.mainSection = $('main-section');
       this.policyTables = {};
-
-      var chromeTable = this.getOrCreateTable('chrome', 'Chrome policies', '',
-        true);
+      var chromeTable = this.appendNewTable('chrome', 'Chrome policies', '');

[Joao da Silva, 2013/06/19 16:35:17]

Creating the chromeTable here is not necessary anymore, since it's now created
on setPolicyNames.

[anitawoodruff, 2013/06/20 09:13:32]

Done.

 
       // Place the initial focus on the filter input field.
       $('filter').focus();
 
       var self = this;
       $('filter').onsearch = function(event) {
         for (policyTable in self.policyTables) {
           self.policyTables[policyTable].setFilterPattern(this.value);
         }
       };
       $('reload-policies').onclick = function(event) {
         this.disabled = true;
         chrome.send('reloadPolicies');
       };
 
       $('show-unset').onchange = function() {
         for (policyTable in self.policyTables) {
           self.policyTables[policyTable].filter();
         }
       };
 
       // Notify the browser that the page has loaded, causing it to send the
       // list of all known policies, the current policy values and the cloud
       // policy status.
       chrome.send('initialized');
     },
 
-    /**
-    * Gets the existing policy table for the given id, or if none exists,
-    * creates a new policy table section, adds the section to the page,
-    * and returns the new table from that section.
-    * @param {string} id The key for the table in policyTables.
-    * @param {string} label_title Title for this policy table.
-    * @param {string} label_content Description for the policy table.
-    * @return {Element} Policy table associated with the given id.
-    */
-   getOrCreateTable: function(id, label_title, label_content, includeStatus) {
-     if (!this.policyTables.hasOwnProperty(id)) {
-       var newSection = this.createPolicyTableSection(id, label_title,
-           label_content, includeStatus);
-       this.mainSection.appendChild(newSection);
-     }
-     return this.policyTables[id];
-   },
+   /**
+     * Creates a new policy table section, adds the section to the page,
+     * and returns the new table from that section.
+     * @param {string} id The key for storing the new table in policyTables.
+     * @param {string} label_title Title for this policy table.
+     * @param {string} label_content Description for the policy table.
+     * @return {Element} The newly created table.
+     */
+    appendNewTable: function(id, label_title, label_content) {
+      var newSection = this.createPolicyTableSection(id, label_title,
+          label_content);
+      this.mainSection.appendChild(newSection);
+      return this.policyTables[id];
+    },
 
     /**
      * Creates a new section containing a title, description and table of
      * policies.
-     * @param {string} id Used as key when storing new table in policyTables.
+     * @param {id} id The key for storing the new table in policyTables.
      * @param {string} label_title Title for this policy table.
      * @param {string} label_content Description for the policy table.
-     * @param {boolean} includeStatus Whether to display a status column.
      * @return {Element} The newly created section.
      */
-    createPolicyTableSection: function(id, label_title, label_content,
-                                       includeStatus) {
+    createPolicyTableSection: function(id, label_title, label_content) {
       var section = document.createElement('section');
       section.setAttribute('class', 'policy-table-section');
 
       // Add title and description.
       var title = window.document.createElement('h3');
       title.textContent = label_title;
       section.appendChild(title);
 
       if (label_content) {
         var description = window.document.createElement('div');
         description.classList.add('table-description');
         description.textContent = label_content;
         section.appendChild(description);
       }
 
       // Add 'No Policies Set' element.
       var noPolicies = window.document.createElement('div');
       noPolicies.classList.add('no-policies-set');
       noPolicies.textContent = loadTimeData.getString('noPoliciesSet');
       section.appendChild(noPolicies);
 
       // Add table of policies.
-      var newTable = this.createPolicyTable(includeStatus);
+      var newTable = this.createPolicyTable();
       this.policyTables[id] = newTable;
       section.appendChild(newTable);
 
       return section;
     },
 
     /**
      * Creates a new table for displaying policies.
-     * @param {boolean} includeStatus Whether to include a status column.
      * @return {Element} The newly created table.
      */
-    createPolicyTable: function(includeStatus) {
+    createPolicyTable: function() {
       var newTable = window.document.createElement('table');
       var tableHead = window.document.createElement('thead');
       var tableRow = window.document.createElement('tr');
       var tableHeadings = ['headerScope', 'headerLevel',
-                           'headerName', 'headerValue'];
-
+                           'headerName', 'headerValue', 'headerStatus'];
       for (var i = 0; i < tableHeadings.length; i++) {
         var tableHeader = window.document.createElement('th');
         tableHeader.textContent = loadTimeData.getString(tableHeadings[i]);
         tableRow.appendChild(tableHeader);
       }
-
-      if (includeStatus) {
-        var statusHeader = window.document.createElement('th');
-        statusHeader.classList.add('status-column');
-        statusHeader.textContent = loadTimeData.getString('headerStatus');
-        tableRow.appendChild(statusHeader);
-      }
-
       tableHead.appendChild(tableRow);
       newTable.appendChild(tableHead);
       cr.ui.decorate(newTable, PolicyTable);
       return newTable;
     },
 
     /**
      * Update the status section of the page to show the current cloud policy
      * status.
      * @param {Object} status Dictionary containing the current policy status.
@@ skipping 29 matching lines @@
   return {
     Page: Page
   };
 });
 
 // Have the main initialization function be called when the page finishes
 // loading.
 document.addEventListener(
     'DOMContentLoaded',
     policy.Page.getInstance().initialize.bind(policy.Page.getInstance()));