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

Unified Diff: chrome/browser/resources/chromeos/chromevox/cvox2/background/tabs_automation_handler.js

Issue 2649373002: Re-land: Update json_schema_compiler to handle the Automation extension API (Closed)
Patch Set: Fix presubmit Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/tabs_automation_handler.js
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/tabs_automation_handler.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/tabs_automation_handler.js
index 836c23c51f43ff1f7145c023806a45bca479501f..0e2365608fe4ed1dc545049ed154990879bf517c 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/tabs_automation_handler.js
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/tabs_automation_handler.js
@@ -8,11 +8,13 @@
goog.provide('TabsAutomationHandler');
+goog.require('CustomAutomationEvent');
goog.require('DesktopAutomationHandler');
goog.scope(function() {
var EventType = chrome.automation.EventType;
var RoleType = chrome.automation.RoleType;
+var StateType = chrome.automation.StateType;
/**
* @param {!chrome.automation.AutomationNode} tabRoot
@@ -22,14 +24,14 @@ var RoleType = chrome.automation.RoleType;
TabsAutomationHandler = function(tabRoot) {
DesktopAutomationHandler.call(this, tabRoot);
- if (tabRoot.role != RoleType.rootWebArea)
+ if (tabRoot.role != RoleType.ROOT_WEB_AREA)
throw new Error('Expected rootWebArea node but got ' + tabRoot.role);
// When the root is focused, simulate what happens on a load complete.
- if (tabRoot.state.focused) {
- this.onLoadComplete(
- new chrome.automation.AutomationEvent(EventType.loadComplete, tabRoot,
- 'page'));
+ if (tabRoot.state[StateType.FOCUSED]) {
+ var event = new CustomAutomationEvent(
+ EventType.LOAD_COMPLETE, tabRoot, 'page');
+ this.onLoadComplete(event);
}
};
@@ -44,8 +46,9 @@ TabsAutomationHandler.prototype = {
/** @override */
onLoadComplete: function(evt) {
var focused = evt.target.find({state: {focused: true}}) || evt.target;
- this.onFocus(new chrome.automation.AutomationEvent(
- EventType.focus, focused, evt.eventFrom));
+ var event = new CustomAutomationEvent(
+ EventType.FOCUS, focused, evt.eventFrom);
+ this.onFocus(event);
}
};

Powered by Google App Engine
This is Rietveld 408576698