Signin screen and locked screen status area focus advancing

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

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 9ed6b7c10a94f172f9b6c4b96dccde4f70bd8aa8..0c828a455979dfd9bdc328b1d048582a13bb6338 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -6,6 +6,7 @@
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/system/tray/system_tray.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/bind.h"
@@ -160,6 +161,7 @@ WebUILoginView::WebUILoginView()
 
   for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
     AddAccelerator(i->first);
+  ash::WmShell::Get()->system_tray_notifier()->AddStatusAreaFocusObserver(this);
 }
 
 WebUILoginView::~WebUILoginView() {
@@ -167,13 +169,8 @@ WebUILoginView::~WebUILoginView() {
                     observer_list_,
                     OnHostDestroying());
 
-  if (!chrome::IsRunningInMash() &&
-      ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
-    ash::Shell::GetInstance()->GetPrimarySystemTray()->
-        SetNextFocusableView(NULL);
-  } else {
-    NOTIMPLEMENTED();
-  }
+  ash::WmShell::Get()->system_tray_notifier()->RemoveStatusAreaFocusObserver(
+      this);
 }
 
 void WebUILoginView::Init() {
@@ -437,7 +434,6 @@ bool WebUILoginView::TakeFocus(content::WebContents* source, bool reverse) {
 
   ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
   if (tray && tray->GetWidget()->IsVisible()) {
-    tray->SetNextFocusableView(this);
     ash::WmShell::Get()->focus_cycler()->RotateFocus(
         reverse ? ash::FocusCycler::BACKWARD : ash::FocusCycler::FORWARD);
   }
@@ -508,6 +504,10 @@ bool WebUILoginView::PreHandleGestureEvent(
       event.type == blink::WebGestureEvent::GesturePinchEnd;
 }
 
+void WebUILoginView::OnWillReturnFocusToWebContents(bool reverse) {
+  AboutToRequestFocusFromTabTraversal(reverse);
+}
+
 void WebUILoginView::OnLoginPromptVisible() {
   // If we're hidden than will generate this signal once we're shown.
   if (is_hidden_ || webui_visible_) {