| Index: chrome/browser/resources/settings/device_page/keyboard.js
|
| diff --git a/chrome/browser/resources/settings/device_page/keyboard.js b/chrome/browser/resources/settings/device_page/keyboard.js
|
| index 87abc1b93ba164011589b52a8f4182a478ba561f..730d4545c688d676e4137a5566c43c298b124a87 100644
|
| --- a/chrome/browser/resources/settings/device_page/keyboard.js
|
| +++ b/chrome/browser/resources/settings/device_page/keyboard.js
|
| @@ -53,6 +53,12 @@ Polymer({
|
| notify: true,
|
| },
|
|
|
| + /** The current active route. */
|
| + currentRoute: {
|
| + type: Object,
|
| + notify: true,
|
| + },
|
| +
|
| /** @private Whether to show Caps Lock options. */
|
| showCapsLock_: Boolean,
|
|
|
| @@ -79,7 +85,7 @@ Polymer({
|
| /** @override */
|
| ready: function() {
|
| cr.addWebUIListener('show-keys-changed', this.onShowKeysChange_.bind(this));
|
| - chrome.send('initializeKeyboardSettings');
|
| + settings.DevicePageBrowserProxyImpl.getInstance().initializeKeyboard();
|
| this.setUpKeyMapTargets_();
|
| },
|
|
|
| @@ -115,6 +121,19 @@ Polymer({
|
| this.showDiamondKey_ = showDiamondKey;
|
| },
|
|
|
| + onShowKeyboardShortcutsOverlayTap_: function() {
|
| + settings.DevicePageBrowserProxyImpl.getInstance()
|
| + .showKeyboardShortcutsOverlay();
|
| + },
|
| +
|
| + onShowLanguageInputTap_: function() {
|
| + this.currentRoute = {
|
| + page: 'advanced',
|
| + section: 'languages',
|
| + subpage: [],
|
| + };
|
| + },
|
| +
|
| /** @private */
|
| autoRepeatDelayPrefChanged_: function() {
|
| var delay = /** @type number */(this.getPref(AUTO_REPEAT_DELAY_PREF).value);
|
|
|