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

Unified Diff: chrome/browser/resources/chromeos/keyboard_overlay.js

Issue 10391044: retry 136193 - convert localStrings to loadTimeData for options page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: plugins, ui_account_tweaks fixes 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/chromeos/keyboard_overlay.js
diff --git a/chrome/browser/resources/chromeos/keyboard_overlay.js b/chrome/browser/resources/chromeos/keyboard_overlay.js
index d2c745fa4b8ad9e3bc854d937ef2e3736543ccb8..02cd057c98c16f10e13f50433f88519bfc9bdde6 100644
--- a/chrome/browser/resources/chromeos/keyboard_overlay.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay.js
@@ -308,7 +308,7 @@ function update(modifiers) {
var shortcutText = document.getElementById(shortcutTextId(identifier, i));
if (shortcutId) {
shortcutText.style.visibility = 'visible';
- shortcutText.textContent = templateData[shortcutId];
+ shortcutText.textContent = loadTimeData.getString('shortcutId');
} else {
shortcutText.style.visibility = 'hidden';
}
@@ -412,20 +412,24 @@ function initLayout() {
var instructionsText = document.createElement('div');
instructionsText.id = 'instructions-text';
instructionsText.className = 'keyboard-overlay-instructions-text';
- instructionsText.innerHTML = templateData.keyboardOverlayInstructions;
+ instructionsText.innerHTML =
+ loadTimeData.getString('keyboardOverlayInstructions');
instructions.appendChild(instructionsText);
var instructionsHideText = document.createElement('div');
instructionsHideText.id = 'instructions-hide-text';
instructionsHideText.className = 'keyboard-overlay-instructions-hide-text';
- instructionsHideText.innerHTML = templateData.keyboardOverlayInstructionsHide;
+ instructionsHideText.innerHTML =
+ loadTimeData.getString('keyboardOverlayInstructionsHide');
instructions.appendChild(instructionsHideText);
var learnMoreLinkText = document.createElement('div');
learnMoreLinkText.id = 'learn-more-text';
learnMoreLinkText.className = 'keyboard-overlay-learn-more-text';
learnMoreLinkText.addEventListener('click', learnMoreClicked);
var learnMoreLinkAnchor = document.createElement('a');
- learnMoreLinkAnchor.href = templateData.keyboardOverlayLearnMoreURL;
- learnMoreLinkAnchor.textContent = templateData.keyboardOverlayLearnMore;
+ learnMoreLinkAnchor.href =
+ loadTimeData.getString('keyboardOverlayLearnMoreURL');
+ learnMoreLinkAnchor.textContent =
+ loadTimeData.getString('keyboardOverlayLearnMore');
learnMoreLinkText.appendChild(learnMoreLinkAnchor);
instructions.appendChild(learnMoreLinkText);
keyboard.appendChild(instructions);
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/proxy_settings.js » ('j') | chrome/browser/resources/plugins.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698