Adapt accessibility code for our needs after chromium 90

Change-Id: I9bc2bd517ee3ee1ea1a8798f636f12b4f48639b0
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

3 files changed, 9 insertions, 6 deletions

diff --git a/chromium/chrome/browser/accessibility/accessibility_ui.cc b/chromium/chrome/browser/accessibility/accessibility_ui.cc
index a5a85673721..c82c30b5133 100644
--- a/chromium/chrome/browser/accessibility/accessibility_ui.cc
+++ b/chromium/chrome/browser/accessibility/accessibility_ui.cc
@@ -181,7 +181,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(Browser* browser) {
 }
 #endif  // !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
 
-#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(TOOLKIT_QT)
 std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
     views::Widget* widget) {
   std::unique_ptr<base::DictionaryValue> widget_data(
@@ -195,7 +195,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
   widget_data->SetInteger(kWidgetIdField, id);
   return widget_data;
 }
-#endif  // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(TOOLKIT_QT)
 
 bool ShouldHandleAccessibilityRequestCallback(const std::string& path) {
   return path == kTargetsDataFile;
@@ -298,7 +298,7 @@ void HandleAccessibilityRequestCallback(
   data.Set(kBrowsersField, std::move(browser_list));
 
   std::unique_ptr<base::ListValue> widgets_list(new base::ListValue());
-#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(TOOLKIT_QT)
   if (features::IsAccessibilityTreeForViewsEnabled()) {
     views::WidgetAXTreeIDMap& manager_map =
         views::WidgetAXTreeIDMap::GetInstance();
@@ -307,7 +307,7 @@ void HandleAccessibilityRequestCallback(
       widgets_list->Append(BuildTargetDescriptor(widget));
     }
   }
-#endif  // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(TOOLKIT_QT)
   data.Set(kWidgetsField, std::move(widgets_list));
 
   std::string json_string;
@@ -674,7 +674,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
 
 void AccessibilityUIMessageHandler::RequestWidgetsTree(
     const base::ListValue* args) {
-#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(TOOLKIT_QT)
   const base::DictionaryValue* data;
   CHECK(args->GetDictionary(0, &data));
 
@@ -718,7 +718,7 @@ void AccessibilityUIMessageHandler::RequestWidgetsTree(
   result->SetString(kErrorField, "Window no longer exists.");
   AllowJavascript();
   FireWebUIListener(request_type, *(result.get()));
-#endif  // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(TOOLKIT_QT)
 }
 
 void AccessibilityUIMessageHandler::Callback(const std::string& str) {
diff --git a/chromium/content/public/browser/ax_inspect_factory.cc b/chromium/content/public/browser/ax_inspect_factory.cc
index e7b72debe5d..dbb49909b29 100644
--- a/chromium/content/public/browser/ax_inspect_factory.cc
+++ b/chromium/content/public/browser/ax_inspect_factory.cc
@@ -70,6 +70,8 @@ AXInspectFactory::Type::operator std::string() const {
       return "win";
     case kWinUIA:
       return "uia";
+    case kQt:
+      return "qt";
     default:
       return "unknown";
   }
diff --git a/chromium/content/public/browser/ax_inspect_factory.h b/chromium/content/public/browser/ax_inspect_factory.h
index 583ba7a2f6a..982ba883005 100644
--- a/chromium/content/public/browser/ax_inspect_factory.h
+++ b/chromium/content/public/browser/ax_inspect_factory.h
@@ -47,6 +47,7 @@ class CONTENT_EXPORT AXInspectFactory {
     kLinux,
     kWinIA2,
     kWinUIA,
+    kQt,
   };
 
   // Inspect type.