Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 // <include src="keyboard_overlay_data.js"> | 5 // <include src="keyboard_overlay_data.js"> |
| 6 | 6 |
| 7 var BASE_KEYBOARD = { | 7 var BASE_KEYBOARD = { |
| 8 top: 0, | 8 top: 0, |
| 9 left: 0, | 9 left: 0, |
| 10 width: 1237, | 10 width: 1237, |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 | 220 |
| 221 if (!isDisplayUIScalingEnabled()) { | 221 if (!isDisplayUIScalingEnabled()) { |
| 222 // Zoom screen in | 222 // Zoom screen in |
| 223 delete shortcutDataCache['+<>CTRL<>SHIFT']; | 223 delete shortcutDataCache['+<>CTRL<>SHIFT']; |
| 224 // Zoom screen out | 224 // Zoom screen out |
| 225 delete shortcutDataCache['-<>CTRL<>SHIFT']; | 225 delete shortcutDataCache['-<>CTRL<>SHIFT']; |
| 226 // Reset screen zoom | 226 // Reset screen zoom |
| 227 delete shortcutDataCache['0<>CTRL<>SHIFT']; | 227 delete shortcutDataCache['0<>CTRL<>SHIFT']; |
| 228 } | 228 } |
| 229 | 229 |
| 230 if (!loadTimeData.getBoolean('backspaceGoesBackFeatureEnabled')) { | 230 // TODO(ojan): crbug.com/721141 Delete these two lines after running |
| 231 // If the "backspace key goes back" experiment is not enabled, then we | 231 // src/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py |
| 232 // clear the shortcuts for Backspace and Shift+Backspace to go back or | 232 // to not have these added to the shortcutDataCache in the first place. |
| 233 // forward respectively. | 233 delete shortcutDataCache['backspace']; |
| 234 delete shortcutDataCache['backspace']; | 234 delete shortcutDataCache['backspace<>SHIFT']; |
|
afakhry
2017/05/11 01:19:35
Please remove these lines as well as the correspon
ojan
2017/05/11 18:25:25
done
| |
| 235 delete shortcutDataCache['backspace<>SHIFT']; | |
| 236 } | |
| 237 | 235 |
| 238 return shortcutDataCache; | 236 return shortcutDataCache; |
| 239 } | 237 } |
| 240 | 238 |
| 241 /** | 239 /** |
| 242 * Returns the keyboard overlay ID. | 240 * Returns the keyboard overlay ID. |
| 243 * @return {string} Keyboard overlay ID. | 241 * @return {string} Keyboard overlay ID. |
| 244 */ | 242 */ |
| 245 function getKeyboardOverlayId() { | 243 function getKeyboardOverlayId() { |
| 246 return keyboardOverlayId; | 244 return keyboardOverlayId; |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 952 function onWidgetShown() { | 950 function onWidgetShown() { |
| 953 setTimeout(function() { | 951 setTimeout(function() { |
| 954 // Show and focus the instructions div after a delay so that chrome vox | 952 // Show and focus the instructions div after a delay so that chrome vox |
| 955 // speaks it correctly. | 953 // speaks it correctly. |
| 956 $('instructions').style.visibility = 'visible'; | 954 $('instructions').style.visibility = 'visible'; |
| 957 $('instructions').focus(); | 955 $('instructions').focus(); |
| 958 }, 500); | 956 }, 500); |
| 959 } | 957 } |
| 960 | 958 |
| 961 document.addEventListener('DOMContentLoaded', init); | 959 document.addEventListener('DOMContentLoaded', init); |
| OLD | NEW |