Keep switch access running until disable dialog is accepted.

Ensures the switch access extension is not unloaded until
the disable dialog is accepted by the user. This allows users
to use switch access switches to accept or cancel the dialog.

AX-Relnotes: n/a
Bug: 1095212
Change-Id: I0c34d1e8c3669faedf27bdbc9d45e4c7b5b29736
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2261185
Commit-Queue: Katie Dektar <katie@chromium.org>
Reviewed-by: Anastasia Helfinstein <anastasi@google.com>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781920}

ash/accessibility/accessibility_controller_impl.cc

@@ -1119,6 +1119,10 @@ void AccessibilityControllerImpl::SetSwitchAccessEnabled(bool enabled) {
   switch_access().SetEnabled(enabled);
 }
 
+bool AccessibilityControllerImpl::IsSwitchAccessRunning() const {
+  return switch_access().enabled() || switch_access_disable_dialog_showing_;
+}
+
 bool AccessibilityControllerImpl::IsSwitchAccessSettingVisibleInTray() {
   return switch_access().IsVisibleInTray();
   return IsEnterpriseIconVisibleInTrayMenu(
@@ -1135,11 +1139,13 @@ void AccessibilityControllerImpl::
 }
 
 void AccessibilityControllerImpl::HideSwitchAccessBackButton() {
-  switch_access_bubble_controller_->HideBackButton();
+  if (IsSwitchAccessRunning())
+    switch_access_bubble_controller_->HideBackButton();
 }
 
 void AccessibilityControllerImpl::HideSwitchAccessMenu() {
-  switch_access_bubble_controller_->HideMenuBubble();
+  if (IsSwitchAccessRunning())
+    switch_access_bubble_controller_->HideMenuBubble();
 }
 
 void AccessibilityControllerImpl::ShowSwitchAccessBackButton(
@@ -1788,9 +1794,12 @@ void AccessibilityControllerImpl::
 
 void AccessibilityControllerImpl::SwitchAccessDisableDialogClosed(
     bool disable_dialog_accepted) {
+  switch_access_disable_dialog_showing_ = false;
   if (disable_dialog_accepted) {
     // The pref was already disabled, but we left switch access on until they
     // accepted the dialog.
+    if (client_)
+      client_->OnSwitchAccessDisabled();
     switch_access_bubble_controller_.reset();
     switch_access_event_handler_.reset();
     NotifyAccessibilityStatusChanged();
@@ -1946,13 +1955,12 @@ void AccessibilityControllerImpl::UpdateFeatureFromPref(FeatureType feature) {
       Shell::Get()->sticky_keys_controller()->Enable(enabled);
       break;
     case FeatureType::kSwitchAccess:
-      // Show a dialog before disabling Switch Access.
       if (!enabled) {
         ShowAccessibilityNotification(A11yNotificationType::kNone);
-
         if (no_switch_access_disable_confirmation_dialog_for_testing_) {
           SwitchAccessDisableDialogClosed(true);
         } else {
+          // Show a dialog before disabling Switch Access.
           new AccessibilityFeatureDisableDialog(
               IDS_ASH_SWITCH_ACCESS_DISABLE_CONFIRMATION_TITLE,
               IDS_ASH_SWITCH_ACCESS_DISABLE_CONFIRMATION_BODY,
@@ -1962,7 +1970,10 @@ void AccessibilityControllerImpl::UpdateFeatureFromPref(FeatureType feature) {
               base::BindOnce(
                   &AccessibilityControllerImpl::SwitchAccessDisableDialogClosed,
                   weak_ptr_factory_.GetWeakPtr(), false));
+          switch_access_disable_dialog_showing_ = true;
         }
+        // Return early. We will call NotifyAccessibilityStatusChanged() if the
+        // user accepts the dialog.
         return;
       } else {
         switch_access_bubble_controller_ =

ash/accessibility/accessibility_controller_impl.h

@@ -285,6 +285,9 @@ class ASH_EXPORT AccessibilityControllerImpl : public AccessibilityController,
 
   void SetSwitchAccessEnabled(bool enabled);
   bool switch_access_enabled() const { return switch_access().enabled(); }
+  // Switch access may be disabled in prefs but still running when the disable
+  // dialog is displaying.
+  bool IsSwitchAccessRunning() const;
   bool IsSwitchAccessSettingVisibleInTray();
   bool IsEnterpriseIconVisibleForSwitchAccess();
 
@@ -475,6 +478,7 @@ class ASH_EXPORT AccessibilityControllerImpl : public AccessibilityController,
   SwitchAccessEventHandlerDelegate* switch_access_event_handler_delegate_ =
       nullptr;
   bool no_switch_access_disable_confirmation_dialog_for_testing_ = false;
+  bool switch_access_disable_dialog_showing_ = false;
 
   // Used to control the highlights of caret, cursor and focus.
   std::unique_ptr<AccessibilityHighlightController>

ash/accessibility/test_accessibility_controller_client.cc

@@ -68,6 +68,8 @@ void TestAccessibilityControllerClient::RequestSelectToSpeakStateChange() {
 void TestAccessibilityControllerClient::
     RequestAutoclickScrollableBoundsForPoint(gfx::Point& point_in_screen) {}
 
+void TestAccessibilityControllerClient::OnSwitchAccessDisabled() {}
+
 int32_t TestAccessibilityControllerClient::GetPlayedEarconAndReset() {
   int32_t tmp = sound_key_;
   sound_key_ = -1;

ash/accessibility/test_accessibility_controller_client.h

@@ -40,6 +40,7 @@ class TestAccessibilityControllerClient : public AccessibilityControllerClient {
   void RequestSelectToSpeakStateChange() override;
   void RequestAutoclickScrollableBoundsForPoint(
       gfx::Point& point_in_screen) override;
+  void OnSwitchAccessDisabled() override;
 
   int32_t GetPlayedEarconAndReset();
 

ash/events/switch_access_event_handler.cc

@@ -16,8 +16,8 @@ namespace ash {
 
 namespace {
 
-bool IsSwitchAccessEnabled() {
-  return Shell::Get()->accessibility_controller()->switch_access_enabled();
+bool IsSwitchAccessRunning() {
+  return Shell::Get()->accessibility_controller()->IsSwitchAccessRunning();
 }
 
 void CancelEvent(ui::Event* event) {
@@ -89,7 +89,7 @@ bool SwitchAccessEventHandler::SetKeyCodesForCommand(
 }
 
 void SwitchAccessEventHandler::OnKeyEvent(ui::KeyEvent* event) {
-  DCHECK(IsSwitchAccessEnabled());
+  DCHECK(IsSwitchAccessRunning());
   DCHECK(event);
 
   if (ShouldCancelEvent(*event)) {

ash/public/cpp/accessibility_controller_client.h

@@ -81,6 +81,12 @@ class ASH_PUBLIC_EXPORT AccessibilityControllerClient {
   // bounds to the given point in screen coordinates.
   virtual void RequestAutoclickScrollableBoundsForPoint(
       gfx::Point& point_in_screen) = 0;
+
+  // Called when Switch Access is fully disabled by the user accepting the
+  // disable dialog. Switch Access must be left running when the pref changes
+  // and before the disable dialog is accepted, so that users can use Switch
+  // Access to cancel or accept the dialog.
+  virtual void OnSwitchAccessDisabled() = 0;
 };
 
 }  // namespace ash

chrome/browser/chromeos/accessibility/accessibility_manager.cc

@@ -985,12 +985,14 @@ void AccessibilityManager::OnSwitchAccessChanged() {
         profile_,
         base::BindRepeating(&AccessibilityManager::PostLoadSwitchAccess,
                             weak_ptr_factory_.GetWeakPtr()));
-  } else {
-    switch_access_loader_->Unload();
-    switch_access_event_handler_delegate_.reset(nullptr);
   }
 }
 
+void AccessibilityManager::OnSwitchAccessDisabled() {
+  switch_access_loader_->Unload();
+  switch_access_event_handler_delegate_.reset();
+}
+
 bool AccessibilityManager::IsBrailleDisplayConnected() const {
   return braille_display_connected_;
 }

chrome/browser/chromeos/accessibility/accessibility_manager.h

@@ -290,6 +290,9 @@ class AccessibilityManager
   // Set the keys to be captured by Switch Access.
   void SetSwitchAccessKeys(const std::set<int>& key_codes);
 
+  // Unloads Switch Access.
+  void OnSwitchAccessDisabled();
+
   // Starts or stops dictation (type what you speak).
   bool ToggleDictation();
 

chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc

@@ -149,3 +149,7 @@ void AccessibilityControllerClient::RequestAutoclickScrollableBoundsForPoint(
   chromeos::AccessibilityManager::Get()
       ->RequestAutoclickScrollableBoundsForPoint(point_in_screen);
 }
+
+void AccessibilityControllerClient::OnSwitchAccessDisabled() {
+  chromeos::AccessibilityManager::Get()->OnSwitchAccessDisabled();
+}

chrome/browser/ui/ash/accessibility/accessibility_controller_client.h

@@ -32,6 +32,7 @@ class AccessibilityControllerClient
   void RequestSelectToSpeakStateChange() override;
   void RequestAutoclickScrollableBoundsForPoint(
       gfx::Point& point_in_screen) override;
+  void OnSwitchAccessDisabled() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AccessibilityControllerClient);