Improvements to accessibility extension api support for "views":...

views/controls/native_control_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/native_control_win.h"
 
 #include <windowsx.h>
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
@@ skipping 84 matching lines @@
 
 void NativeControlWin::Focus() {
   DCHECK(native_view());
   SetFocus(native_view());
 
   // Since we are being wrapped by a view, accessibility should receive
   // the super class as the focused view.
   View* parent_view = GetParent();
 
   // Due to some controls not behaving as expected without having
-  // a native win32 control, we exclude the following from sending
-  // their IAccessible as focus events.
-  if (parent_view->GetClassName() != views::Combobox::kViewClassName &&
-      parent_view->HasFocus())
-    parent_view->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS);
+  // a native win32 control, we don't always send a native (MSAA)
+  // focus notification.
+  bool send_native_event =
+      parent_view->GetClassName() != views::Combobox::kViewClassName &&
+      parent_view->HasFocus();
+
+  // Send the accessibility focus notification.
+  parent_view->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS,
+                                        send_native_event);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, protected:
 
 void NativeControlWin::ShowContextMenu(const gfx::Point& location) {
   if (!GetContextMenuController())
     return;
 
   if (location.x() == -1 && location.y() == -1)
@@ skipping 87 matching lines @@
     }
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window, native_control->original_wndproc_);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
                         w_param, l_param);
 }
 
 }  // namespace views