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

Side by Side Diff: chrome/browser/resources/options2/chromeos/virtual_keyboard_list.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.define('options', function() { 5 cr.define('options', function() {
6 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; 6 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
7 /** @const */ var List = cr.ui.List; 7 /** @const */ var List = cr.ui.List;
8 /** @const */ var ListItem = cr.ui.ListItem; 8 /** @const */ var ListItem = cr.ui.ListItem;
9 /** @const */ var VirtualKeyboardOptions = options.VirtualKeyboardOptions; 9 /** @const */ var VirtualKeyboardOptions = options.VirtualKeyboardOptions;
10 10
11 /** @const */ var localStrings = new LocalStrings();
12
13 /** 11 /**
14 * Creates a virtual keyboard list item. 12 * Creates a virtual keyboard list item.
15 * 13 *
16 * Accepts values in the form 14 * Accepts values in the form
17 * { layout: 'us(dvorak)', 15 * { layout: 'us(dvorak)',
18 * layoutName: 'US Dvorak layout', 16 * layoutName: 'US Dvorak layout',
19 * preferredKeyboard: 'http://...', [optional] 17 * preferredKeyboard: 'http://...', [optional]
20 * supportedKeyboards: [ 18 * supportedKeyboards: [
21 * { name: 'Simple Virtual Keyboard', 19 * { name: 'Simple Virtual Keyboard',
22 * isSystem: true, 20 * isSystem: true,
(...skipping 26 matching lines...) Expand all
49 layoutNameElement.textContent = data.layoutName; 47 layoutNameElement.textContent = data.layoutName;
50 layoutNameElement.className = 'virtual-keyboard-layout-column'; 48 layoutNameElement.className = 'virtual-keyboard-layout-column';
51 this.appendChild(layoutNameElement); 49 this.appendChild(layoutNameElement);
52 50
53 // Virtual keyboard selection. 51 // Virtual keyboard selection.
54 var keyboardElement = document.createElement('div'); 52 var keyboardElement = document.createElement('div');
55 var selectElement = document.createElement('select'); 53 var selectElement = document.createElement('select');
56 var defaultOptionElement = document.createElement('option'); 54 var defaultOptionElement = document.createElement('option');
57 defaultOptionElement.selected = (data.preferredKeyboard == null); 55 defaultOptionElement.selected = (data.preferredKeyboard == null);
58 defaultOptionElement.textContent = 56 defaultOptionElement.textContent =
59 localStrings.getString('defaultVirtualKeyboard'); 57 loadTimeData.getString('defaultVirtualKeyboard');
60 defaultOptionElement.value = -1; 58 defaultOptionElement.value = -1;
61 selectElement.appendChild(defaultOptionElement); 59 selectElement.appendChild(defaultOptionElement);
62 60
63 for (var i = 0; i < data.supportedKeyboards.length; ++i) { 61 for (var i = 0; i < data.supportedKeyboards.length; ++i) {
64 var optionElement = document.createElement('option'); 62 var optionElement = document.createElement('option');
65 optionElement.selected = 63 optionElement.selected =
66 (data.preferredKeyboard != null && 64 (data.preferredKeyboard != null &&
67 data.preferredKeyboard == data.supportedKeyboards[i].url); 65 data.preferredKeyboard == data.supportedKeyboards[i].url);
68 optionElement.textContent = data.supportedKeyboards[i].name; 66 optionElement.textContent = data.supportedKeyboards[i].name;
69 optionElement.value = i; 67 optionElement.value = i;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 setVirtualKeyboardList: function(list) { 135 setVirtualKeyboardList: function(list) {
138 this.dataModel = new ArrayDataModel(list); 136 this.dataModel = new ArrayDataModel(list);
139 }, 137 },
140 }; 138 };
141 139
142 return { 140 return {
143 VirtualKeyboardListItem: VirtualKeyboardListItem, 141 VirtualKeyboardListItem: VirtualKeyboardListItem,
144 VirtualKeyboardsList: VirtualKeyboardsList, 142 VirtualKeyboardsList: VirtualKeyboardsList,
145 }; 143 };
146 }); 144 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698