Revert "Set focus to a ConfirmInfoBar. This serves to alerts screen reader users ..."

This reverts commit 60342.

TBR=dtseng
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/3472008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60348 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 9 deletions

diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index 1fe3921..58a4db6 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -127,7 +127,7 @@ InfoBar::~InfoBar() {
 bool InfoBar::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
 
-  *role = AccessibilityTypes::ROLE_ALERT;
+  *role = AccessibilityTypes::ROLE_PANE;
   return true;
 }
 
@@ -253,8 +253,6 @@ void InfoBar::InfoBarAdded() {
                                                          GetFocusManager()));
   }
 #endif
-
-  NotifyAccessibilityEvent(AccessibilityTypes::EVENT_ALERT);
 }
 
 void InfoBar::InfoBarRemoved() {
diff --git a/views/accessibility/accessibility_types.h b/views/accessibility/accessibility_types.h
index b30208f..4470344 100644
--- a/views/accessibility/accessibility_types.h
+++ b/views/accessibility/accessibility_types.h
@@ -47,7 +47,6 @@ class AccessibilityTypes {
   // must provide a conversion to its own roles (see e.g.
   // ViewAccessibility::get_accRole and ViewAccessibility::MSAARole).
   enum Role {
-    ROLE_ALERT,
     ROLE_APPLICATION,
     ROLE_BUTTONDROPDOWN,
     ROLE_BUTTONMENU,
@@ -83,7 +82,6 @@ class AccessibilityTypes {
   // events must provide a conversion to its own events (see e.g.
   // ViewAccessibility::MSAAEvent).
   enum Event {
-    EVENT_ALERT,
     EVENT_FOCUS,
     EVENT_MENUSTART,
     EVENT_MENUEND,
diff --git a/views/accessibility/view_accessibility.cc b/views/accessibility/view_accessibility.cc
index 985097f..07eec0d 100644
--- a/views/accessibility/view_accessibility.cc
+++ b/views/accessibility/view_accessibility.cc
@@ -675,8 +675,6 @@ STDMETHODIMP ViewAccessibility::put_accValue(VARIANT var_id, BSTR put_val) {
 
 int32 ViewAccessibility::MSAAEvent(AccessibilityTypes::Event event) {
   switch (event) {
-    case AccessibilityTypes::EVENT_ALERT:
-      return EVENT_SYSTEM_ALERT;
     case AccessibilityTypes::EVENT_FOCUS:
       return EVENT_OBJECT_FOCUS;
     case AccessibilityTypes::EVENT_MENUSTART:
@@ -696,8 +694,6 @@ int32 ViewAccessibility::MSAAEvent(AccessibilityTypes::Event event) {
 
 int32 ViewAccessibility::MSAARole(AccessibilityTypes::Role role) {
   switch (role) {
-    case AccessibilityTypes::ROLE_ALERT:
-      return ROLE_SYSTEM_ALERT;
     case AccessibilityTypes::ROLE_APPLICATION:
       return ROLE_SYSTEM_APPLICATION;
     case AccessibilityTypes::ROLE_BUTTONDROPDOWN: