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_;
}
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index c8cc490..1247c1f 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -32,7 +32,6 @@
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_delegate.h"
#include "content/browser/wake_lock/wake_lock_context_host.h"
-#include "content/common/accessibility_mode.h"
#include "content/common/content_export.h"
#include "content/public/browser/color_chooser.h"
#include "content/public/browser/download_url_parameters.h"
@@ -51,6 +50,7 @@
#include "services/device/public/interfaces/wake_lock.mojom.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
#include "third_party/WebKit/public/platform/WebDragOperation.h"
+#include "ui/accessibility/ax_modes.h"
#include "ui/base/page_transition_types.h"
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/geometry/size.h"
@@ -239,11 +239,11 @@
void WasUnOccluded();
// Broadcasts the mode change to all frames.
- void SetAccessibilityMode(AccessibilityMode mode);
+ void SetAccessibilityMode(ui::AXMode mode);
// Adds the given accessibility mode to the current accessibility mode
// bitmap.
- void AddAccessibilityMode(AccessibilityMode mode);
+ void AddAccessibilityMode(ui::AXMode mode);
#if !defined(OS_ANDROID)
// Set a temporary zoom level for the frames associated with this WebContents.
@@ -521,7 +521,7 @@
const std::string& encoding) override;
WebContents* GetAsWebContents() override;
bool IsNeverVisible() override;
- AccessibilityMode GetAccessibilityMode() const override;
+ ui::AXMode GetAccessibilityMode() const override;
void AccessibilityEventReceived(
const std::vector<AXEventNotificationDetails>& details) override;
void AccessibilityLocationChangesReceived(
@@ -1599,7 +1599,7 @@
// The accessibility mode for all frames. This is queried when each frame
// is created, and broadcast to all frames when it changes.
- AccessibilityMode accessibility_mode_;
+ ui::AXMode accessibility_mode_;
// Monitors power levels for audio streams associated with this WebContents.
AudioStreamMonitor audio_stream_monitor_;
