Move the accessibility mode flags from content/ to ui/
In order to use the accessibility mode flags from the ui AXPlatformNode
and friends, we need to move the flags from content/common into
ui/accessibility. The majority of this change is mechincal renaming.
Bug: 703369
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: I683d1e0abcf5ce33b65ea206f07899a12a284bb5
Reviewed-on: https://chromium-review.googlesource.com/588383
Commit-Queue: Doug Turner <[email protected]>
Reviewed-by: Dominic Mazzoni <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/master@{#490630}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 39fd87d..ca41199e 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1025,7 +1025,7 @@
return theme_color_;
}
-void WebContentsImpl::SetAccessibilityMode(AccessibilityMode mode) {
+void WebContentsImpl::SetAccessibilityMode(ui::AXMode mode) {
if (mode == accessibility_mode_)
return;
@@ -1045,8 +1045,8 @@
}
}
-void WebContentsImpl::AddAccessibilityMode(AccessibilityMode mode) {
- AccessibilityMode new_mode(accessibility_mode_);
+void WebContentsImpl::AddAccessibilityMode(ui::AXMode mode) {
+ ui::AXMode new_mode(accessibility_mode_);
new_mode |= mode;
SetAccessibilityMode(new_mode);
}
@@ -1204,16 +1204,16 @@
for (RenderFrameHost* rfh : GetAllFrames())
ResetAccessibility(rfh);
} else {
- AddAccessibilityMode(kAccessibilityModeWebContentsOnly);
+ AddAccessibilityMode(ui::kAXModeWebContentsOnly);
}
}
bool WebContentsImpl::IsWebContentsOnlyAccessibilityModeForTesting() const {
- return accessibility_mode_ == kAccessibilityModeWebContentsOnly;
+ return accessibility_mode_ == ui::kAXModeWebContentsOnly;
}
bool WebContentsImpl::IsFullAccessibilityModeForTesting() const {
- return accessibility_mode_ == kAccessibilityModeComplete;
+ return accessibility_mode_ == ui::kAXModeComplete;
}
const PageImportanceSignals& WebContentsImpl::GetPageImportanceSignals() const {
@@ -2622,7 +2622,7 @@
return DevToolsAgentHost::IsDebuggerAttached(this);
}
-AccessibilityMode WebContentsImpl::GetAccessibilityMode() const {
+ui::AXMode WebContentsImpl::GetAccessibilityMode() const {
return accessibility_mode_;
}
