Merge to M50: Fix accessible focus state on menu bar container.

ui/accessibility/platform/ax_platform_node_win.cc

Index: ui/accessibility/platform/ax_platform_node_win.cc
diff --git a/ui/accessibility/platform/ax_platform_node_win.cc b/ui/accessibility/platform/ax_platform_node_win.cc
index 168f2fea006cb530d868d7f307358de3ca049993..e11c21e6b99d730f34115e912e6c539022176166 100644
--- a/ui/accessibility/platform/ax_platform_node_win.cc
+++ b/ui/accessibility/platform/ax_platform_node_win.cc
@@ -1050,9 +1050,15 @@ int AXPlatformNodeWin::MSAAState() {
     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)
+  // menu bars, when visible.
+  //
+  // TODO(dmazzoni): this should probably check if focus is actually inside
+  // the menu bar, but we don't currently track focus inside menu pop-ups,
+  // and Chrome only has one menu visible at a time so this works for now.
+  if (GetData().role == ui::AX_ROLE_MENU_BAR &&
+      !(state & (1 << ui::AX_STATE_INVISIBLE))) {
     msaa_state |= STATE_SYSTEM_FOCUSED;
+  }
 
   return msaa_state;
 }