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

Unified Diff: chrome/browser/resources/options2/chromeos/internet_detail.js

Issue 10391044: retry 136193 - convert localStrings to loadTimeData for options page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options2/chromeos/internet_detail.js
diff --git a/chrome/browser/resources/options2/chromeos/internet_detail.js b/chrome/browser/resources/options2/chromeos/internet_detail.js
index 1c34e4516d6d1a028e7472472fd7407da86f4b6b..79cc3af3e1995efd4cd7017ead584202a2ca37a7 100644
--- a/chrome/browser/resources/options2/chromeos/internet_detail.js
+++ b/chrome/browser/resources/options2/chromeos/internet_detail.js
@@ -407,7 +407,7 @@ cr.define('options.internet', function() {
bannerDiv.hidden = false;
// controlledBy must match strings loaded in proxy_handler.cc and
// set in proxy_cros_settings_provider.cc.
- $('banner-text').textContent = localStrings.getString(controlledBy);
+ $('banner-text').textContent = loadTimeData.getString(controlledBy);
}
},
@@ -598,7 +598,7 @@ cr.define('options.internet', function() {
var statusKey = data.connected ? 'networkConnected' :
'networkNotConnected';
$('network-details-subtitle-status').textContent =
- localStrings.getString(statusKey);
+ loadTimeData.getString(statusKey);
var typeKey = null;
switch (data.type) {
case Constants.TYPE_ETHERNET:
@@ -617,7 +617,7 @@ cr.define('options.internet', function() {
var typeLabel = $('network-details-subtitle-type');
var typeSeparator = $('network-details-subtitle-separator');
if (typeKey) {
- typeLabel.textContent = localStrings.getString(typeKey);
+ typeLabel.textContent = loadTimeData.getString(typeKey);
typeLabel.hidden = false;
typeSeparator.hidden = false;
} else {
@@ -675,24 +675,24 @@ cr.define('options.internet', function() {
ipConfigList.autoExpands = true;
var model = new ArrayDataModel([]);
model.push({
- 'property': 'inetAddress',
- 'name': localStrings.getString('inetAddress'),
- 'value': inetAddress,
+ property: 'inetAddress',
+ name: loadTimeData.getString('inetAddress'),
+ value: inetAddress,
});
model.push({
- 'property': 'inetSubnetAddress',
- 'name': localStrings.getString('inetSubnetAddress'),
- 'value': inetSubnetAddress,
+ property: 'inetSubnetAddress',
+ name: loadTimeData.getString('inetSubnetAddress'),
+ value: inetSubnetAddress,
});
model.push({
- 'property': 'inetGateway',
- 'name': localStrings.getString('inetGateway'),
- 'value': inetGateway,
+ property: 'inetGateway',
+ name: loadTimeData.getString('inetGateway'),
+ value: inetGateway,
});
model.push({
- 'property': 'inetDns',
- 'name': localStrings.getString('inetDns'),
- 'value': inetDns,
+ property: 'inetDns',
+ name: loadTimeData.getString('inetDns'),
+ value: inetDns,
});
ipConfigList.dataModel = model;
@@ -755,11 +755,11 @@ cr.define('options.internet', function() {
$('wifi-security-entry').hidden = true;
}
// Frequency is in MHz.
- var frequency = localStrings.getString('inetFrequencyFormat');
+ var frequency = loadTimeData.getString('inetFrequencyFormat');
frequency = frequency.replace('$1', data.frequency);
$('wifi-frequency').textContent = frequency;
// Signal strength as percentage.
- var signalStrength = localStrings.getString('inetSignalStrengthFormat');
+ var signalStrength = loadTimeData.getString('inetSignalStrengthFormat');
signalStrength = signalStrength.replace('$1', data.strength);
$('wifi-signal-strength').textContent = signalStrength;
if (data.hardwareAddress) {

Powered by Google App Engine
This is Rietveld 408576698