Keep track of accessibility focus across windows.

ui/accessibility/platform/ax_platform_node_win.cc

 // Copyright 2015 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 <atlbase.h>
 #include <atlcom.h>
 #include <limits.h>
 #include <oleacc.h>
 #include <stdint.h>
 
@@ skipping 964 matching lines @@
   if (state & (1 << ui::AX_STATE_CHECKED))
     msaa_state |= STATE_SYSTEM_CHECKED;
   if (state & (1 << ui::AX_STATE_COLLAPSED))
     msaa_state |= STATE_SYSTEM_COLLAPSED;
   if (state & (1 << ui::AX_STATE_DEFAULT))
     msaa_state |= STATE_SYSTEM_DEFAULT;
   if (state & (1 << ui::AX_STATE_EXPANDED))
     msaa_state |= STATE_SYSTEM_EXPANDED;
   if (state & (1 << ui::AX_STATE_FOCUSABLE))
     msaa_state |= STATE_SYSTEM_FOCUSABLE;
-  if (state & (1 << ui::AX_STATE_FOCUSED))
-    msaa_state |= STATE_SYSTEM_FOCUSED;
   if (state & (1 << ui::AX_STATE_HASPOPUP))
     msaa_state |= STATE_SYSTEM_HASPOPUP;
   if (state & (1 << ui::AX_STATE_HOVERED))
     msaa_state |= STATE_SYSTEM_HOTTRACKED;
   if (state & (1 << ui::AX_STATE_INVISIBLE))
     msaa_state |= STATE_SYSTEM_INVISIBLE;
   if (state & (1 << ui::AX_STATE_LINKED))
     msaa_state |= STATE_SYSTEM_LINKED;
   if (state & (1 << ui::AX_STATE_OFFSCREEN))
     msaa_state |= STATE_SYSTEM_OFFSCREEN;
   if (state & (1 << ui::AX_STATE_PRESSED))
     msaa_state |= STATE_SYSTEM_PRESSED;
   if (state & (1 << ui::AX_STATE_PROTECTED))
     msaa_state |= STATE_SYSTEM_PROTECTED;
   if (state & (1 << ui::AX_STATE_READ_ONLY))
     msaa_state |= STATE_SYSTEM_READONLY;
   if (state & (1 << ui::AX_STATE_SELECTABLE))
     msaa_state |= STATE_SYSTEM_SELECTABLE;
   if (state & (1 << ui::AX_STATE_SELECTED))
     msaa_state |= STATE_SYSTEM_SELECTED;
   if (state & (1 << ui::AX_STATE_DISABLED))
     msaa_state |= STATE_SYSTEM_UNAVAILABLE;
 
+  gfx::NativeViewAccessible focus = delegate_->GetFocus();
+  if (focus == GetNativeViewAccessible())
+    msaa_state |= STATE_SYSTEM_FOCUSED;
+
+  // On Windows, the "focus" bit should be set on certain containers, like
+  // menu bars, when one of their children has focus.
+  if (GetData().role == ui::AX_ROLE_MENU_BAR && focus)
+    msaa_state |= STATE_SYSTEM_FOCUSED;
+
   return msaa_state;
 }
 
 int AXPlatformNodeWin::MSAAEvent(ui::AXEvent event) {
   switch (event) {
     case ui::AX_EVENT_ALERT:
       return EVENT_SYSTEM_ALERT;
     case ui::AX_EVENT_FOCUS:
       return EVENT_OBJECT_FOCUS;
     case ui::AX_EVENT_MENU_START:
@@ skipping 84 matching lines @@
     LONG start_offset,
     ui::TextBoundaryDirection direction) {
   HandleSpecialTextOffset(text, &start_offset);
   ui::TextBoundaryType boundary = IA2TextBoundaryToTextBoundary(ia2_boundary);
   std::vector<int32_t> line_breaks;
   return static_cast<LONG>(ui::FindAccessibleTextBoundary(
       text, line_breaks, boundary, start_offset, direction));
 }
 
 }  // namespace ui