WebUI: Update some more uses of the old-style i18ntemplate/LocalStrings.

chrome/browser/resources/about_sys/about_sys.js

 // Copyright 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.
 
-var localStrings;
-
 // Contents of lines that act as delimiters for multi-line values.
 var DELIM_START = '---------- START ----------';
 var DELIM_END = '---------- END ----------';
 
 // Limit file size to 10 MiB to prevent hanging on accidental upload.
 var MAX_FILE_SIZE = 10485760;
 
 function getValueDivForButton(button) {
   return $(button.id.substr(0, button.id.length - 4));
 }
 
 function getButtonForValueDiv(valueDiv) {
   return $(valueDiv.id + '-btn');
 }
 
 function handleDragOver(e) {
   e.dataTransfer.dropEffect = 'copy';
   e.preventDefault();
 }
 
 function handleDrop(e) {
   var file = e.dataTransfer.files[0];
   if (file) {
     e.preventDefault();
     importLog(file);
   }
 }
 
 function showError(fileName) {
-  $('status').textContent = localStrings.getStringF('parseError', fileName);
+  $('status').textContent = loadTimeData.getStringF('parseError', fileName);
 }
 
 /**
  * Toggles whether an item is collapsed or expanded.
  */
 function changeCollapsedStatus() {
   var valueDiv = getValueDivForButton(this);
   if (valueDiv.parentNode.className == 'number-collapsed') {
     valueDiv.parentNode.className = 'number-expanded';
-    this.textContent = localStrings.getString('collapseBtn');
+    this.textContent = loadTimeData.getString('collapseBtn');
   } else {
     valueDiv.parentNode.className = 'number-collapsed';
-    this.textContent = localStrings.getString('expandBtn');
+    this.textContent = loadTimeData.getString('expandBtn');
   }
 }
 
 /**
  * Collapses all log items.
  */
 function collapseAll() {
   var valueDivs = document.getElementsByClassName('stat-value');
   for (var i = 0; i < valueDivs.length; i++) {
     var button = getButtonForValueDiv(valueDivs[i]);
     if (button && button.className != 'button-hidden') {
-      button.textContent = localStrings.getString('expandBtn');
+      button.textContent = loadTimeData.getString('expandBtn');
       valueDivs[i].parentNode.className = 'number-collapsed';
     }
   }
 }
 
 /**
  * Expands all log items.
  */
 function expandAll() {
   var valueDivs = document.getElementsByClassName('stat-value');
   for (var i = 0; i < valueDivs.length; i++) {
     var button = getButtonForValueDiv(valueDivs[i]);
     if (button && button.className != 'button-hidden') {
-      button.textContent = localStrings.getString('collapseBtn');
+      button.textContent = loadTimeData.getString('collapseBtn');
       valueDivs[i].parentNode.className = 'number-expanded';
     }
   }
 }
 
 /**
  * Collapse only those log items with multi-line values.
  */
 function collapseMultiLineStrings() {
   var valueDivs = document.getElementsByClassName('stat-value');
   var nameDivs = document.getElementsByClassName('stat-name');
   for (var i = 0; i < valueDivs.length; i++) {
     var button = getButtonForValueDiv(valueDivs[i]);
     button.onclick = changeCollapsedStatus;
     if (valueDivs[i].scrollHeight > (nameDivs[i].scrollHeight * 2)) {
       button.className = '';
-      button.textContent = localStrings.getString('expandBtn');
+      button.textContent = loadTimeData.getString('expandBtn');
       valueDivs[i].parentNode.className = 'number-collapsed';
     } else {
       button.className = 'button-hidden';
       valueDivs[i].parentNode.className = 'number';
     }
   }
 }
 
 /**
  * Read in a log asynchronously, calling parseSystemLog if successful.
  * @param {File} file The file to read.
  */
 function importLog(file) {
   if (file && file.size <= MAX_FILE_SIZE) {
     var reader = new FileReader();
     reader.onload = function() {
       if (parseSystemLog(this.result)) {
         // Reset table title and status
         $('tableTitle').textContent =
-              localStrings.getStringF('logFileTableTitle', file.name);
+              loadTimeData.getStringF('logFileTableTitle', file.name);
         $('status').textContent = '';
       } else {
         showError(file.name);
       }
     };
     reader.readAsText(file);
   } else if (file) {
     showError(file.name);
   }
 }
@@ skipping 40 matching lines @@
       while (i < len && lines[i] != DELIM_END)
         value += lines[i++] + '\n';
 
       // Remove trailing newline.
       if (value)
         value = value.substr(0, value.length - 1);
     }
     details.push({'statName': name, 'statValue': value});
   }
 
-  templateData['details'] = details;
+  var templateData = { 'details': details };

[Dan Beam, 2014/09/23 00:20:47]

{\s -> {
\s} -> }

[Evan Stade, 2014/09/23 01:05:36]

Done.

   i18nTemplate.process(document, templateData);
   jstProcess(new JsEvalContext(templateData), $('t'));
 
   collapseMultiLineStrings();
   return true;
 }
 
 document.addEventListener('DOMContentLoaded', function() {
-  localStrings = new LocalStrings();
+  jstProcess(new JsEvalContext(loadTimeData.data_), $('t'));

[Dan Beam, 2014/09/23 00:20:47]

why is this accessing a private member?

[Evan Stade, 2014/09/23 01:05:36]

fixed

 
   $('collapseAll').onclick = collapseAll;
   $('expandAll').onclick = expandAll;
 
   var tp = $('t');
   tp.addEventListener('dragover', handleDragOver, false);
   tp.addEventListener('drop', handleDrop, false);
 
   collapseMultiLineStrings();
 });