Signin screen and locked screen status area focus advancing

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/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
@@ skipping 134 matching lines @@
   accel_map_[ui::Accelerator(ui::VKEY_S,
                              ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
       kAccelNameAppLaunchBailout;
 
   accel_map_[ui::Accelerator(ui::VKEY_N,
                              ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
       kAccelNameAppLaunchNetworkConfig;
 
   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() {
   FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver,
                     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() {
   Profile* signin_profile = ProfileHelper::GetSigninProfile();
   webui_login_ = new views::WebView(signin_profile);
   webui_login_->set_allow_accelerators(true);
   AddChildView(webui_login_);
 
   WebContents* web_contents = webui_login_->GetWebContents();
 
@@ skipping 243 matching lines @@
   if (!forward_keyboard_event_)
     return false;
 
   // Focus is accepted, but the Ash system tray is not available in Mash, so
   // exit early.
   if (chrome::IsRunningInMash())
     return true;
 
   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);
   }
 
   return true;
 }
 
 void WebUILoginView::RequestMediaAccessPermission(
     WebContents* web_contents,
     const content::MediaStreamRequest& request,
@@ skipping 50 matching lines @@
 
 bool WebUILoginView::PreHandleGestureEvent(
     content::WebContents* source,
     const blink::WebGestureEvent& event) {
   // Disable pinch zooming.
   return event.type == blink::WebGestureEvent::GesturePinchBegin ||
       event.type == blink::WebGestureEvent::GesturePinchUpdate ||
       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_) {
     VLOG(1) << "Login WebUI >> not emitting signal, hidden: " << is_hidden_;
     return;
   }
   TRACE_EVENT0("chromeos", "WebUILoginView::OnLoginPromoptVisible");
   if (should_emit_login_prompt_visible_) {
     VLOG(1) << "Login WebUI >> login-prompt-visible";
     chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
         EmitLoginPromptVisible();
   }
 
   webui_visible_ = true;
 }
 
 }  // namespace chromeos