123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Shelley Vohr <[email protected]>
- Date: Mon, 6 Jul 2020 13:46:06 -0700
- Subject: fix: patch out Profile refs in accessibility_ui
- This tweaks Chrome's Accessibility support at chrome://accessibility
- to make it usable from Electron by removing Profile references.
- diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
- index 2c8687d0df72572b8c628519b370d21d5390df56..ef5f7f226ce4b8dc7fd0923255b13040dca65a99 100644
- --- a/chrome/browser/accessibility/accessibility_ui.cc
- +++ b/chrome/browser/accessibility/accessibility_ui.cc
- @@ -21,7 +21,10 @@
- #include "base/trace_event/trace_event.h"
- #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
- +#if 0
- #include "chrome/browser/profiles/profile.h"
- +#endif
- +#include "chrome/common/chrome_features.h"
- #include "chrome/common/pref_names.h"
- #include "chrome/common/webui_url_constants.h"
- #include "chrome/grit/accessibility_resources.h"
- @@ -50,9 +53,11 @@
- #include "ui/views/accessibility/view_accessibility.h"
-
- #if !BUILDFLAG(IS_ANDROID)
- +#if 0
- #include "chrome/browser/ui/browser.h"
- #include "chrome/browser/ui/browser_list.h"
- #include "chrome/browser/ui/browser_window.h"
- +#endif
- #include "ui/views/accessibility/widget_ax_tree_id_map.h"
- #include "ui/views/widget/widget.h"
- #include "ui/views/widget/widget_delegate.h"
- @@ -163,7 +168,7 @@ base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
- accessibility_mode);
- }
-
- -#if !BUILDFLAG(IS_ANDROID)
- +#if 0
- base::Value::Dict BuildTargetDescriptor(Browser* browser) {
- base::Value::Dict target_data;
- target_data.Set(kSessionIdField, browser->session_id().id());
- @@ -197,7 +202,9 @@ void HandleAccessibilityRequestCallback(
- DCHECK(ShouldHandleAccessibilityRequestCallback(path));
-
- base::Value::Dict data;
- +#if 0
- PrefService* pref = Profile::FromBrowserContext(current_context)->GetPrefs();
- +#endif
- ui::AXMode mode =
- content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
- bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
- @@ -229,7 +236,7 @@ void HandleAccessibilityRequestCallback(
- // enabled.
- data.Set(kViewsAccessibility, features::IsAccessibilityTreeForViewsEnabled());
-
- - bool show_internal = pref->GetBoolean(prefs::kShowInternalAccessibilityTree);
- + bool show_internal = true;
- data.Set(kInternal, show_internal ? kOn : kOff);
-
- base::Value::List page_list;
- @@ -265,11 +272,11 @@ void HandleAccessibilityRequestCallback(
- data.Set(kPagesField, std::move(page_list));
-
- base::Value::List browser_list;
- -#if !BUILDFLAG(IS_ANDROID)
- +#if 0
- for (Browser* browser : *BrowserList::GetInstance()) {
- browser_list.Append(BuildTargetDescriptor(browser));
- }
- -#endif // !BUILDFLAG(IS_ANDROID)
- +#endif // !BUILDFLAG(IS_ANDROID)
- data.Set(kBrowsersField, std::move(browser_list));
-
- base::Value::List widgets_list;
- @@ -486,8 +493,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(
-
- AllowJavascript();
- if (flag_name_str == kInternal) {
- +#if 0
- PrefService* pref = Profile::FromWebUI(web_ui())->GetPrefs();
- pref->SetBoolean(prefs::kShowInternalAccessibilityTree, enabled);
- +#endif
- return;
- }
-
- @@ -591,8 +600,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
- AXPropertyFilter::ALLOW_EMPTY);
- AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
-
- +#if 0
- PrefService* pref = Profile::FromWebUI(web_ui())->GetPrefs();
- bool internal = pref->GetBoolean(prefs::kShowInternalAccessibilityTree);
- +#else
- + bool internal = true;
- +#endif
- std::string accessibility_contents =
- web_contents->DumpAccessibilityTree(internal, property_filters);
- result.Set(kTreeField, accessibility_contents);
- @@ -617,6 +630,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
- AXPropertyFilter::ALLOW_EMPTY);
- AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
-
- +#if 0
- for (Browser* browser : *BrowserList::GetInstance()) {
- if (browser->session_id().id() == session_id) {
- base::Value::Dict result = BuildTargetDescriptor(browser);
- @@ -629,6 +643,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
- return;
- }
- }
- +#endif
- #endif // !BUILDFLAG(IS_ANDROID)
- // No browser with the specified |session_id| was found.
- base::Value::Dict result;
- @@ -741,5 +756,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
- // static
- void AccessibilityUIMessageHandler::RegisterProfilePrefs(
- user_prefs::PrefRegistrySyncable* registry) {
- +#if 0
- registry->RegisterBooleanPref(prefs::kShowInternalAccessibilityTree, false);
- +#endif
- }
- diff --git a/chrome/browser/accessibility/accessibility_ui.h b/chrome/browser/accessibility/accessibility_ui.h
- index 94fdbf91a5f6e03a259eb970f1d402a6d3cc12e4..2be0cbce1090b7dccad7ef483baa68fbc4235964 100644
- --- a/chrome/browser/accessibility/accessibility_ui.h
- +++ b/chrome/browser/accessibility/accessibility_ui.h
- @@ -22,6 +22,8 @@ struct AXEventNotificationDetails;
- class WebContents;
- } // namespace content
-
- +class ElectronAccessibilityUIMessageHandler;
- +
- namespace user_prefs {
- class PrefRegistrySyncable;
- } // namespace user_prefs
- @@ -63,6 +65,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
- static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
-
- private:
- + friend class ElectronAccessibilityUIMessageHandler;
- +
- std::vector<std::string> event_logs_;
- std::unique_ptr<AccessibilityUIObserver> observer_;
-
|