reland: cros: Fix keyboard navigation focus get lost when system tray set to invisible on oobe

chrome/browser/chromeos/login/ui/webui_login_view.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/ui/webui_login_view.h"
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
@@ skipping 439 matching lines @@
   // we should not process focus change events.
   if (!forward_keyboard_event_)
     return false;
 
   // Focus is accepted, but the Ash system tray is not available in Mash, so
   // exit early.
   if (ash_util::IsRunningInMash())
     return true;
 
   ash::SystemTray* tray = ash::Shell::Get()->GetPrimarySystemTray();
-  if (tray && tray->GetWidget()->IsVisible()) {
+  if (tray && tray->GetWidget()->IsVisible() && tray->visible()) {
     tray->SetNextFocusableView(this);
     ash::Shell::Get()->focus_cycler()->RotateFocus(
         reverse ? ash::FocusCycler::BACKWARD : ash::FocusCycler::FORWARD);
+  } else {
+    AboutToRequestFocusFromTabTraversal(reverse);
   }
 
   return true;
 }
 
 void WebUILoginView::RequestMediaAccessPermission(
     WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
   // Note: This is needed for taking photos when selecting new user images
@@ skipping 29 matching lines @@
   if (should_emit_login_prompt_visible_) {
     VLOG(1) << "Login WebUI >> login-prompt-visible";
     chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
         EmitLoginPromptVisible();
   }
 
   webui_visible_ = true;
 }
 
 }  // namespace chromeos