From f27a0b59065835a9fe6f9a30681c36f14fe9edc3 Mon Sep 17 00:00:00 2001 From: "dmazzoni@chromium.org" Date: Fri, 1 Oct 2010 19:57:53 +0000 Subject: Disable the code that registers accessibility handlers for the wizard, as a temporary fix for major Chrome OS problems. They were getting called even though the user didn't explicitly enable accessibility, and continuing to fire even after the wizard wasn't open anymore. Should re-enable as soon as the real root cause has been fixed. BUG=http://cros.com/7238 BUG=http://cros.com/7240 TEST=manual testing Review URL: http://codereview.chromium.org/3569009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61217 0039d316-1c4b-4281-b951-d872f2087c98 --- .../chromeos/login/wizard_accessibility_helper.cc | 37 +++++++++++++--------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc index db0f097..91f3fb2 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc @@ -37,21 +37,28 @@ WizardAccessibilityHelper* WizardAccessibilityHelper::GetInstance() { WizardAccessibilityHelper::WizardAccessibilityHelper() { accessibility_handler_.reset(new WizardAccessibilityHandler()); profile_ = ProfileManager::GetDefaultProfile(); - registrar_.Add(accessibility_handler_.get(), - NotificationType::ACCESSIBILITY_CONTROL_FOCUSED, - NotificationService::AllSources()); - registrar_.Add(accessibility_handler_.get(), - NotificationType::ACCESSIBILITY_CONTROL_ACTION, - NotificationService::AllSources()); - registrar_.Add(accessibility_handler_.get(), - NotificationType::ACCESSIBILITY_TEXT_CHANGED, - NotificationService::AllSources()); - registrar_.Add(accessibility_handler_.get(), - NotificationType::ACCESSIBILITY_MENU_OPENED, - NotificationService::AllSources()); - registrar_.Add(accessibility_handler_.get(), - NotificationType::ACCESSIBILITY_MENU_CLOSED, - NotificationService::AllSources()); + + // http://crosbug.com/7238 + // TODO(dmazzoni), TODO(chaitanyag) + // Commented out to disable trapping handling and responding to + // accessibility notifications until the root cause of this bug has + // been determined. + // + //registrar_.Add(accessibility_handler_.get(), + // NotificationType::ACCESSIBILITY_CONTROL_FOCUSED, + // NotificationService::AllSources()); + //registrar_.Add(accessibility_handler_.get(), + // NotificationType::ACCESSIBILITY_CONTROL_ACTION, + // NotificationService::AllSources()); + //registrar_.Add(accessibility_handler_.get(), + // NotificationType::ACCESSIBILITY_TEXT_CHANGED, + // NotificationService::AllSources()); + //registrar_.Add(accessibility_handler_.get(), + // NotificationType::ACCESSIBILITY_MENU_OPENED, + // NotificationService::AllSources()); + //registrar_.Add(accessibility_handler_.get(), + // NotificationType::ACCESSIBILITY_MENU_CLOSED, + // NotificationService::AllSources()); } void WizardAccessibilityHelper::MaybeEnableAccessibility( -- cgit v1.1