| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 /** | 5 /** |
| 6 * @fileoverview Common page for reading and writing preferences from | 6 * @fileoverview Common page for reading and writing preferences from |
| 7 * the background context (background page or options page). | 7 * the background context (background page or options page). |
| 8 * | 8 * |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 'outputContextFirst': false, | 72 'outputContextFirst': false, |
| 73 'position': '{}', | 73 'position': '{}', |
| 74 'siteSpecificScriptBase': | 74 'siteSpecificScriptBase': |
| 75 'https://ssl.gstatic.com/accessibility/javascript/ext/', | 75 'https://ssl.gstatic.com/accessibility/javascript/ext/', |
| 76 'siteSpecificScriptLoader': | 76 'siteSpecificScriptLoader': |
| 77 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js', | 77 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js', |
| 78 'sticky': false, | 78 'sticky': false, |
| 79 'typingEcho': 0, | 79 'typingEcho': 0, |
| 80 'useIBeamCursor': cvox.ChromeVox.isMac, | 80 'useIBeamCursor': cvox.ChromeVox.isMac, |
| 81 'useVerboseMode': true, | 81 'useVerboseMode': true, |
| 82 'siteSpecificEnhancements': true, | 82 'siteSpecificEnhancements': true |
| 83 'useNext': false | |
| 84 }; | 83 }; |
| 85 | 84 |
| 86 | 85 |
| 87 /** | 86 /** |
| 88 * Merge the default values of all known prefs with what's found in | 87 * Merge the default values of all known prefs with what's found in |
| 89 * localStorage. | 88 * localStorage. |
| 90 * @param {boolean} pullFromLocalStorage or not to pull prefs from local | 89 * @param {boolean} pullFromLocalStorage or not to pull prefs from local |
| 91 * storage. True if we want to respect changes the user has already made | 90 * storage. True if we want to respect changes the user has already made |
| 92 * to prefs, false if we want to overwrite them. Set false if we've made | 91 * to prefs, false if we want to overwrite them. Set false if we've made |
| 93 * changes to keyboard shortcuts and need to make sure they aren't | 92 * changes to keyboard shortcuts and need to make sure they aren't |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 * @return {boolean} True if the key was bound to the command. | 224 * @return {boolean} True if the key was bound to the command. |
| 226 */ | 225 */ |
| 227 cvox.ChromeVoxPrefs.prototype.setKey = function(command, newKey) { | 226 cvox.ChromeVoxPrefs.prototype.setKey = function(command, newKey) { |
| 228 if (this.keyMap_.rebind(command, newKey)) { | 227 if (this.keyMap_.rebind(command, newKey)) { |
| 229 this.keyMap_.toLocalStorage(); | 228 this.keyMap_.toLocalStorage(); |
| 230 this.sendPrefsToAllTabs(false, true); | 229 this.sendPrefsToAllTabs(false, true); |
| 231 return true; | 230 return true; |
| 232 } | 231 } |
| 233 return false; | 232 return false; |
| 234 }; | 233 }; |
| OLD | NEW |