Index: chrome/browser/chromeos/login/ui/webui_login_view.cc |
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc |
index 594d1a88cc2ee6da2e478a5787b16998483fb926..5508d0aa3fee29fefd9ef6714e434ad5eeacd7c0 100644 |
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc |
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc |
@@ -457,10 +457,12 @@ bool WebUILoginView::TakeFocus(content::WebContents* source, bool reverse) { |
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; |