Commit 60e3f8ec authored by David Tseng's avatar David Tseng Committed by Commit Bot

Remove unused Chrome automation api

The Chrome channel was once used by ChromeVox to disable ChromeVox Classic (use ChromeVox Next) when in dev channel. Since ChromeVox/ChromeVox Next now ships by default everywhere, this is no longer necessary.

Original change
https://codereview.chromium.org/2640503002

TBR=dcheng@chromium.org

Change-Id: I0b9b4f844ec5d3b40171027da5e04e0fb248eb49
Reviewed-on: https://chromium-review.googlesource.com/1239439Reviewed-by: default avatarDavid Tseng <dtseng@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593420}
parent bc9d2c8e
...@@ -139,11 +139,6 @@ Background = function() { ...@@ -139,11 +139,6 @@ Background = function() {
*/ */
this.focusRecoveryMap_ = new WeakMap(); this.focusRecoveryMap_ = new WeakMap();
chrome.automation.getDesktop(function(desktop) {
/** @type {string} */
this.chromeChannel_ = desktop.chromeChannel;
}.bind(this));
CommandHandler.init(); CommandHandler.init();
FindHandler.init(); FindHandler.init();
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
#include "chrome/common/channel_info.h"
#include "ui/accessibility/ax_enums.mojom.h" #include "ui/accessibility/ax_enums.mojom.h"
#include "ui/accessibility/ax_node_data.h" #include "ui/accessibility/ax_node_data.h"
#include "ui/aura/env.h" #include "ui/aura/env.h"
...@@ -74,9 +73,6 @@ void AXRootObjWrapper::GetChildren( ...@@ -74,9 +73,6 @@ void AXRootObjWrapper::GetChildren(
void AXRootObjWrapper::Serialize(ui::AXNodeData* out_node_data) { void AXRootObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
out_node_data->id = unique_id_.Get(); out_node_data->id = unique_id_.Get();
out_node_data->role = ax::mojom::Role::kDesktop; out_node_data->role = ax::mojom::Role::kDesktop;
out_node_data->AddStringAttribute(ax::mojom::StringAttribute::kChromeChannel,
chrome::GetChannelName());
display::Screen* screen = display::Screen::GetScreen(); display::Screen* screen = display::Screen::GetScreen();
if (!screen) if (!screen)
return; return;
......
...@@ -1269,10 +1269,6 @@ AutomationRootNodeImpl.prototype = { ...@@ -1269,10 +1269,6 @@ AutomationRootNodeImpl.prototype = {
return result; return result;
}, },
get chromeChannel() {
return GetStringAttribute(this.treeID, this.id, 'chromeChannel');
},
get docUrl() { get docUrl() {
return GetDocURL(this.treeID); return GetDocURL(this.treeID);
}, },
...@@ -1491,7 +1487,6 @@ function AutomationRootNode() { ...@@ -1491,7 +1487,6 @@ function AutomationRootNode() {
utils.expose(AutomationRootNode, AutomationRootNodeImpl, { utils.expose(AutomationRootNode, AutomationRootNodeImpl, {
superclass: AutomationNode, superclass: AutomationNode,
readonly: [ readonly: [
'chromeChannel',
'docTitle', 'docTitle',
'docUrl', 'docUrl',
'docLoaded', 'docLoaded',
......
...@@ -56,9 +56,6 @@ void AXRootObjWrapper::GetChildren( ...@@ -56,9 +56,6 @@ void AXRootObjWrapper::GetChildren(
void AXRootObjWrapper::Serialize(ui::AXNodeData* out_node_data) { void AXRootObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
out_node_data->id = unique_id_.Get(); out_node_data->id = unique_id_.Get();
out_node_data->role = ax::mojom::Role::kDesktop; out_node_data->role = ax::mojom::Role::kDesktop;
// TODO(rmrossi) : Find out of this can be removed
out_node_data->AddStringAttribute(ax::mojom::StringAttribute::kChromeChannel,
"");
} }
const ui::AXUniqueId& AXRootObjWrapper::GetUniqueId() const { const ui::AXUniqueId& AXRootObjWrapper::GetUniqueId() const {
......
...@@ -1162,8 +1162,6 @@ const char* ToString(ax::mojom::StringAttribute string_attribute) { ...@@ -1162,8 +1162,6 @@ const char* ToString(ax::mojom::StringAttribute string_attribute) {
return "ariaInvalidValue"; return "ariaInvalidValue";
case ax::mojom::StringAttribute::kAutoComplete: case ax::mojom::StringAttribute::kAutoComplete:
return "autoComplete"; return "autoComplete";
case ax::mojom::StringAttribute::kChromeChannel:
return "chromeChannel";
case ax::mojom::StringAttribute::kClassName: case ax::mojom::StringAttribute::kClassName:
return "className"; return "className";
case ax::mojom::StringAttribute::kContainerLiveRelevant: case ax::mojom::StringAttribute::kContainerLiveRelevant:
...@@ -1216,8 +1214,6 @@ ax::mojom::StringAttribute ParseStringAttribute(const char* string_attribute) { ...@@ -1216,8 +1214,6 @@ ax::mojom::StringAttribute ParseStringAttribute(const char* string_attribute) {
return ax::mojom::StringAttribute::kAriaInvalidValue; return ax::mojom::StringAttribute::kAriaInvalidValue;
if (0 == strcmp(string_attribute, "autoComplete")) if (0 == strcmp(string_attribute, "autoComplete"))
return ax::mojom::StringAttribute::kAutoComplete; return ax::mojom::StringAttribute::kAutoComplete;
if (0 == strcmp(string_attribute, "chromeChannel"))
return ax::mojom::StringAttribute::kChromeChannel;
if (0 == strcmp(string_attribute, "className")) if (0 == strcmp(string_attribute, "className"))
return ax::mojom::StringAttribute::kClassName; return ax::mojom::StringAttribute::kClassName;
if (0 == strcmp(string_attribute, "containerLiveRelevant")) if (0 == strcmp(string_attribute, "containerLiveRelevant"))
......
...@@ -426,7 +426,6 @@ enum StringAttribute { ...@@ -426,7 +426,6 @@ enum StringAttribute {
// Only used when invalid_state == invalid_state_other. // Only used when invalid_state == invalid_state_other.
kAriaInvalidValue, kAriaInvalidValue,
kAutoComplete, kAutoComplete,
kChromeChannel, // Native / Automation
kClassName, // Native / Android kClassName, // Native / Android
kContainerLiveRelevant, kContainerLiveRelevant,
kContainerLiveStatus, kContainerLiveStatus,
......
...@@ -914,9 +914,6 @@ std::string AXNodeData::ToString() const { ...@@ -914,9 +914,6 @@ std::string AXNodeData::ToString() const {
case ax::mojom::StringAttribute::kAutoComplete: case ax::mojom::StringAttribute::kAutoComplete:
result += " autocomplete=" + value; result += " autocomplete=" + value;
break; break;
case ax::mojom::StringAttribute::kChromeChannel:
result += " chrome_channel=" + value;
break;
case ax::mojom::StringAttribute::kClassName: case ax::mojom::StringAttribute::kClassName:
result += " class_name=" + value; result += " class_name=" + value;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment