| Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js
|
| diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js
|
| index 71e1fee2c8254cc762ef4e4f476f9da2f8d75831..876beae68974b41c80d2f08fcb250b0b93ae75ee 100644
|
| --- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js
|
| +++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js
|
| @@ -18,6 +18,7 @@ goog.require('Notifications');
|
| goog.require('Output');
|
| goog.require('Output.EventType');
|
| goog.require('PanelCommand');
|
| +goog.require('Stubs');
|
| goog.require('constants');
|
| goog.require('cursors.Cursor');
|
| goog.require('cvox.BrailleKeyCommand');
|
| @@ -106,8 +107,8 @@ Background = function() {
|
| if (cvox.ChromeVox.isChromeOS) {
|
| Object.defineProperty(cvox.ChromeVox, 'modKeyStr', {
|
| get: function() {
|
| - return (this.mode == ChromeVoxMode.CLASSIC || this.mode ==
|
| - ChromeVoxMode.COMPAT) ?
|
| + return (this.mode == ChromeVoxMode.CLASSIC ||
|
| + this.mode == ChromeVoxMode.COMPAT) ?
|
| 'Search+Shift' : 'Search';
|
| }.bind(this)
|
| });
|
| @@ -146,15 +147,10 @@ Background = function() {
|
| */
|
| this.mode_ = null;
|
|
|
| - if (!chrome.accessibilityPrivate.setKeyboardListener)
|
| - chrome.accessibilityPrivate.setKeyboardListener = function() {};
|
| -
|
| - if (cvox.ChromeVox.isChromeOS) {
|
| - chrome.accessibilityPrivate.onAccessibilityGesture.addListener(
|
| - this.onAccessibilityGesture_);
|
| -
|
| - Notifications.onStartup();
|
| - }};
|
| + chrome.accessibilityPrivate.onAccessibilityGesture.addListener(
|
| + this.onAccessibilityGesture_);
|
| + Notifications.onStartup();
|
| +};
|
|
|
| /**
|
| * @const {string}
|
| @@ -255,9 +251,7 @@ Background.prototype = {
|
| chrome.commands.onCommand.hasListener(this.onGotCommand))
|
| chrome.commands.onCommand.removeListener(this.onGotCommand);
|
| chrome.accessibilityPrivate.setKeyboardListener(false, false);
|
| -
|
| - if (cvox.ChromeVox.isChromeOS)
|
| - chrome.accessibilityPrivate.setFocusRing([]);
|
| + chrome.accessibilityPrivate.setFocusRing([]);
|
| } else {
|
| if (chrome.commands &&
|
| !chrome.commands.onCommand.hasListener(this.onGotCommand))
|
|
|