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/status_area_widget_delegate.h"
 #include "ash/common/system/tray/system_tray.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"
@@ skipping 28 matching lines @@
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/renderer_preferences.h"
 #include "extensions/browser/view_type_utils.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/controls/webview/webview.h"
+#include "ui/views/focus/focus_manager.h"
+#include "ui/views/focus/focus_search.h"
 #include "ui/views/widget/widget.h"
 
 using content::NativeWebKeyboardEvent;
 using content::RenderViewHost;
 using content::WebContents;
 using web_modal::WebContentsModalDialogManager;
 
 namespace {
 
 // These strings must be kept in sync with handleAccelerator()
@@ skipping 23 matching lines @@
   ~ScopedArrowKeyTraversal() {
     views::FocusManager::set_arrow_key_traversal_enabled(
         previous_arrow_key_traversal_enabled_);
   }
 
  private:
   const bool previous_arrow_key_traversal_enabled_;
   DISALLOW_COPY_AND_ASSIGN(ScopedArrowKeyTraversal);
 };
 
+// A helper method returns status area widget delegate if exists,
+// otherwise nullptr.
+ash::StatusAreaWidgetDelegate* GetStatusAreaWidgetDelegate() {
+  ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
+  return tray ? static_cast<ash::StatusAreaWidgetDelegate*>(
+                    tray->GetWidget()->GetContentsView())
+              : nullptr;
+}
+
 }  // namespace
 
 namespace chromeos {
 
 // static
 const char WebUILoginView::kViewClassName[] =
     "browser/chromeos/login/WebUILoginView";
 
+// WebUILoginView::CycleFocusTraversable ---------------------------------------
+class WebUILoginView::CycleFocusTraversable : public views::FocusTraversable {
+ public:
+  explicit CycleFocusTraversable(WebUILoginView* webui_login_view)
+      : cycle_focus_search_(webui_login_view, true, false) {}
+  ~CycleFocusTraversable() override {}
+
+  // views::FocusTraversable
+  views::FocusSearch* GetFocusSearch() override { return &cycle_focus_search_; }
+
+  views::FocusTraversable* GetFocusTraversableParent() override {
+    return nullptr;
+  }
+
+  views::View* GetFocusTraversableParentView() override { return nullptr; }
+
+ private:
+  views::FocusSearch cycle_focus_search_;
+
+  DISALLOW_COPY_AND_ASSIGN(CycleFocusTraversable);
+};
+
+// WebUILoginView::StatusAreaFocusTraversable ----------------------------------
+class WebUILoginView::StatusAreaFocusTraversable
+    : public views::FocusTraversable {
+ public:
+  StatusAreaFocusTraversable(
+      ash::StatusAreaWidgetDelegate* status_area_widget_delegate,
+      WebUILoginView* webui_login_view)
+      : webui_login_view_(webui_login_view),
+        status_area_focus_search_(status_area_widget_delegate, false, false) {}
+  ~StatusAreaFocusTraversable() override {}
+
+  // views::FocusTraversable
+  views::FocusSearch* GetFocusSearch() override {
+    return &status_area_focus_search_;
+  }
+
+  views::FocusTraversable* GetFocusTraversableParent() override {
+    return webui_login_view_->cycle_focus_traversable_.get();
+  }
+
+  views::View* GetFocusTraversableParentView() override {
+    return webui_login_view_->status_area_widget_host_;
+  }
+
+ private:
+  WebUILoginView* const webui_login_view_;
+  views::FocusSearch status_area_focus_search_;
+
+  DISALLOW_COPY_AND_ASSIGN(StatusAreaFocusTraversable);
+};
+
 // WebUILoginView public: ------------------------------------------------------
 
 WebUILoginView::WebUILoginView()
     : webui_login_(NULL),
       is_hidden_(false),
       webui_visible_(false),
       should_emit_login_prompt_visible_(true),
       forward_keyboard_event_(true) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
@@ skipping 45 matching lines @@
     AddAccelerator(i->first);
 }
 
 WebUILoginView::~WebUILoginView() {
   FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver,
                     observer_list_,
                     OnHostDestroying());
 
   if (!chrome::IsRunningInMash() &&
       ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
-    ash::Shell::GetInstance()->GetPrimarySystemTray()->
-        SetNextFocusableView(NULL);
+    views::Widget* tray_widget =
+        ash::Shell::GetInstance()->GetPrimarySystemTray()->GetWidget();
+    ash::StatusAreaWidgetDelegate* status_area_widget_delegate =
+        static_cast<ash::StatusAreaWidgetDelegate*>(
+            tray_widget->GetContentsView());
+    status_area_widget_delegate->set_custom_focus_traversable(nullptr);
+    status_area_widget_delegate->set_default_last_focusable_child(false);
   } else {
     NOTIMPLEMENTED();
   }
 }
 
 void WebUILoginView::Init() {
   Profile* signin_profile = ProfileHelper::GetSigninProfile();
   webui_login_ = new views::WebView(signin_profile);
   webui_login_->set_allow_accelerators(true);
   AddChildView(webui_login_);
@@ skipping 15 matching lines @@
   WebContentsModalDialogManager::FromWebContents(web_contents)->
       SetDelegate(this);
 
   web_contents->SetDelegate(this);
   extensions::SetViewType(web_contents, extensions::VIEW_TYPE_COMPONENT);
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents);
   content::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
   renderer_preferences_util::UpdateFromSystemSettings(
       prefs, signin_profile, web_contents);
+
+  status_area_widget_host_ = new views::View;
+  AddChildView(status_area_widget_host_);
 }
 
 const char* WebUILoginView::GetClassName() const {
   return kViewClassName;
 }
 
 void WebUILoginView::RequestFocus() {
   webui_login_->RequestFocus();
 }
 
@@ skipping 55 matching lines @@
   webui_login_->LoadInitialURL(url);
   webui_login_->RequestFocus();
 
   // TODO(nkostylev): Use WebContentsObserver::RenderViewCreated to track
   // when RenderView is created.
   GetWebContents()
       ->GetRenderViewHost()
       ->GetWidget()
       ->GetView()
       ->SetBackgroundColor(SK_ColorTRANSPARENT);
+
+  ash::StatusAreaWidgetDelegate* status_area_widget_delegate =
+      GetStatusAreaWidgetDelegate();
+  DCHECK(status_area_widget_delegate);
+  cycle_focus_traversable_.reset(new CycleFocusTraversable(this));
+  status_area_focus_traversable_.reset(
+      new StatusAreaFocusTraversable(status_area_widget_delegate, this));
+  status_area_widget_delegate->set_custom_focus_traversable(
+      status_area_focus_traversable_.get());
 }
 
 content::WebUI* WebUILoginView::GetWebUI() {
   return webui_login_->web_contents()->GetWebUI();
 }
 
 content::WebContents* WebUILoginView::GetWebContents() {
   return webui_login_->web_contents();
 }
 
@@ skipping 134 matching lines @@
   // In case of blocked UI (ex.: sign in is in progress)
   // 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 (chrome::IsRunningInMash())
     return true;
 
-  ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
-  if (tray && tray->GetWidget()->IsVisible()) {
-    tray->SetNextFocusableView(this);
+  ash::StatusAreaWidgetDelegate* status_area_widget_delegate =
+      GetStatusAreaWidgetDelegate();
+  if (status_area_widget_delegate && status_area_widget_delegate->visible()) {

[xiyuan, 2016/09/13 21:56:46]

status_area_widget_delegate->visible() is not the same thing as its Widget's
visibility. We should do

  if (status_area_widget_delegate &&
status_area_widget_delegate->GetWidget()->IsVisible())

[Qiang(Joe) Xu, 2016/09/13 22:07:21]

done. Thanks, good to know this.

+    status_area_widget_delegate->set_default_last_focusable_child(reverse);
     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 67 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