Views: Change View::RequestFocus to respect keyboard accessibility.

ui/views/focus/focus_manager.cc

 // Copyright (c) 2012 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 "ui/views/focus/focus_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 369 matching lines @@
     SetFocusedView(NULL);
     SetStoredFocusView(focused_view);
   }
 
   if (v)
     v->SchedulePaint();  // Remove focus border.
 }
 
 bool FocusManager::RestoreFocusedView() {
   View* view = GetStoredFocusView();
-  if (view && ContainsView(view)) {
-    // This usually just sets the focus if this view is accessibility
-    // focusable, but let the view override RequestFocus if necessary.
-    view->RequestFocus();
+  if (view) {

[karandeepb, 2016/05/13 09:05:31]

This is the same as the code before https://codereview.chromium.org/1894383002/
except the additions on line 407-411.

+    if (ContainsView(view)) {
+      if (!view->IsFocusable() && view->IsAccessibilityFocusable()) {
+        // RequestFocus would fail, but we want to restore focus to controls
+        // that had focus in accessibility mode.
+        SetFocusedViewWithReason(view, kReasonFocusRestore);
+      } else {
+        // This usually just sets the focus if this view is focusable, but
+        // let the view override RequestFocus if necessary.
+        view->RequestFocus();
 
-    // If it succeeded, the reason would be incorrect; set it to
-    // focus restore.
-    if (focused_view_ == view)
-      focus_change_reason_ = kReasonFocusRestore;
-
+        // If it succeeded, the reason would be incorrect; set it to
+        // focus restore.
+        if (focused_view_ == view)
+          focus_change_reason_ = kReasonFocusRestore;
+      }
+    }
     // The |keyboard_accessible_| mode may have changed while the widget was
     // inactive.
     AdvanceFocusIfNecessary();
   }
   return view && view == focused_view_;
 }
 
 void FocusManager::SetStoredFocusView(View* focus_view) {
   ViewStorage* view_storage = ViewStorage::GetInstance();
   if (!view_storage) {
@@ skipping 135 matching lines @@
 // |keyboard_accessible_| is only used on Mac.
 #if defined(OS_MACOSX)
   return keyboard_accessible_ ? view->IsAccessibilityFocusable()
                               : view->IsFocusable();
 #else
   return view->IsAccessibilityFocusable();
 #endif
 }
 
 }  // namespace views