fix_patch_out_profile_refs_in_accessibility_ui.patch 5.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Shelley Vohr <[email protected]>
  3. Date: Mon, 6 Jul 2020 13:46:06 -0700
  4. Subject: fix: patch out Profile refs in accessibility_ui
  5. This tweaks Chrome's Accessibility support at chrome://accessibility
  6. to make it usable from Electron by removing Profile references.
  7. diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
  8. index 7a8ca6523bfd1ce237da9dce7fce03a6acb8b75e..c485572aa06e4b750468b8e23816fbcbf0515757 100644
  9. --- a/chrome/browser/accessibility/accessibility_ui.cc
  10. +++ b/chrome/browser/accessibility/accessibility_ui.cc
  11. @@ -20,7 +20,10 @@
  12. #include "base/values.h"
  13. #include "build/build_config.h"
  14. #include "build/chromeos_buildflags.h"
  15. +#if 0
  16. #include "chrome/browser/profiles/profile.h"
  17. +#endif
  18. +#include "chrome/common/chrome_features.h"
  19. #include "chrome/common/pref_names.h"
  20. #include "chrome/common/webui_url_constants.h"
  21. #include "chrome/grit/dev_ui_browser_resources.h"
  22. @@ -49,9 +52,11 @@
  23. #include "ui/views/accessibility/view_accessibility.h"
  24. #if !BUILDFLAG(IS_ANDROID)
  25. +#if 0
  26. #include "chrome/browser/ui/browser.h"
  27. #include "chrome/browser/ui/browser_list.h"
  28. #include "chrome/browser/ui/browser_window.h"
  29. +#endif
  30. #include "ui/views/accessibility/widget_ax_tree_id_map.h"
  31. #include "ui/views/widget/widget.h"
  32. #include "ui/views/widget/widget_delegate.h"
  33. @@ -163,7 +168,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
  34. accessibility_mode);
  35. }
  36. -#if !BUILDFLAG(IS_ANDROID)
  37. +#if 0
  38. std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(Browser* browser) {
  39. std::unique_ptr<base::DictionaryValue> target_data(
  40. new base::DictionaryValue());
  41. @@ -202,7 +207,9 @@ void HandleAccessibilityRequestCallback(
  42. DCHECK(ShouldHandleAccessibilityRequestCallback(path));
  43. base::DictionaryValue data;
  44. +#if 0
  45. PrefService* pref = Profile::FromBrowserContext(current_context)->GetPrefs();
  46. +#endif
  47. ui::AXMode mode =
  48. content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
  49. bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
  50. @@ -236,7 +243,7 @@ void HandleAccessibilityRequestCallback(
  51. data.SetBoolean(kViewsAccessibility,
  52. features::IsAccessibilityTreeForViewsEnabled());
  53. - bool show_internal = pref->GetBoolean(prefs::kShowInternalAccessibilityTree);
  54. + bool show_internal = true;
  55. data.SetString(kInternal, show_internal ? kOn : kOff);
  56. std::unique_ptr<base::ListValue> rvh_list(new base::ListValue());
  57. @@ -271,11 +278,11 @@ void HandleAccessibilityRequestCallback(
  58. data.Set(kPagesField, std::move(rvh_list));
  59. std::unique_ptr<base::ListValue> browser_list(new base::ListValue());
  60. -#if !BUILDFLAG(IS_ANDROID)
  61. +#if 0
  62. for (Browser* browser : *BrowserList::GetInstance()) {
  63. browser_list->Append(BuildTargetDescriptor(browser));
  64. }
  65. -#endif // !BUILDFLAG(IS_ANDROID)
  66. +#endif // !BUILDFLAG(IS_ANDROID)
  67. data.Set(kBrowsersField, std::move(browser_list));
  68. std::unique_ptr<base::ListValue> widgets_list(new base::ListValue());
  69. @@ -491,8 +498,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(const base::ListValue* args) {
  70. AllowJavascript();
  71. if (flag_name_str == kInternal) {
  72. +#if 0
  73. PrefService* pref = Profile::FromWebUI(web_ui())->GetPrefs();
  74. pref->SetBoolean(prefs::kShowInternalAccessibilityTree, enabled);
  75. +#endif
  76. return;
  77. }
  78. @@ -599,10 +608,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
  79. AXPropertyFilter::ALLOW_EMPTY);
  80. AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  81. +#if 0
  82. PrefService* pref = Profile::FromWebUI(web_ui())->GetPrefs();
  83. bool internal = pref->GetBoolean(prefs::kShowInternalAccessibilityTree);
  84. +#endif
  85. std::string accessibility_contents =
  86. - web_contents->DumpAccessibilityTree(internal, property_filters);
  87. + web_contents->DumpAccessibilityTree(true, property_filters);
  88. result->SetString(kTreeField, accessibility_contents);
  89. FireWebUIListener(request_type, *(result.get()));
  90. }
  91. @@ -627,6 +638,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
  92. AXPropertyFilter::ALLOW_EMPTY);
  93. AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  94. +#if 0
  95. for (Browser* browser : *BrowserList::GetInstance()) {
  96. if (browser->session_id().id() == session_id) {
  97. std::unique_ptr<base::DictionaryValue> result(
  98. @@ -641,6 +653,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
  99. return;
  100. }
  101. }
  102. +#endif
  103. #endif // !BUILDFLAG(IS_ANDROID)
  104. // No browser with the specified |session_id| was found.
  105. std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
  106. @@ -757,5 +770,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
  107. // static
  108. void AccessibilityUIMessageHandler::RegisterProfilePrefs(
  109. user_prefs::PrefRegistrySyncable* registry) {
  110. +#if 0
  111. registry->RegisterBooleanPref(prefs::kShowInternalAccessibilityTree, false);
  112. +#endif
  113. }
  114. diff --git a/chrome/browser/accessibility/accessibility_ui.h b/chrome/browser/accessibility/accessibility_ui.h
  115. index 0f73d3883093f6e49427ac6fe6428e97282a1e03..9041c90d13b07b03cc96e8a03a3821ef54a69a7d 100644
  116. --- a/chrome/browser/accessibility/accessibility_ui.h
  117. +++ b/chrome/browser/accessibility/accessibility_ui.h
  118. @@ -26,6 +26,8 @@ struct AXEventNotificationDetails;
  119. class WebContents;
  120. } // namespace content
  121. +class ElectronAccessibilityUIMessageHandler;
  122. +
  123. namespace user_prefs {
  124. class PrefRegistrySyncable;
  125. } // namespace user_prefs
  126. @@ -67,6 +69,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
  127. static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
  128. private:
  129. + friend class ElectronAccessibilityUIMessageHandler;
  130. +
  131. std::vector<std::string> event_logs_;
  132. std::unique_ptr<AccessibilityUIObserver> observer_;