(Mac)Views: Widgets focus first View in traversal order if initial focus fails.

ui/views/widget/widget.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/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 1285 matching lines @@
 
 Widget* Widget::AsWidget() {
   return this;
 }
 
 const Widget* Widget::AsWidget() const {
   return this;
 }
 
 bool Widget::SetInitialFocus(ui::WindowShowState show_state) {
+  FocusManager* focus_manager = GetFocusManager();
   View* v = widget_delegate_->GetInitiallyFocusedView();
   if (!focus_on_creation_ || show_state == ui::SHOW_STATE_INACTIVE ||
       show_state == ui::SHOW_STATE_MINIMIZED) {
     // If not focusing the window now, tell the focus manager which view to
     // focus when the window is restored.
-    if (v && focus_manager_.get())
-      focus_manager_->SetStoredFocusView(v);
+    if (v && focus_manager)
+      focus_manager->SetStoredFocusView(v);
     return true;
   }
-  if (v)
+  if (v) {
     v->RequestFocus();
+    // If the request for focus was unsuccessful, fall back to using the first
+    // focusable View instead.
+    if (focus_manager && v != focus_manager->GetFocusedView())

[sky, 2017/01/12 16:34:13]

Rather than checking |v|, how about checking for null? If focus ended up on some
random view I think we shouldn't try to advance.

[Patti Lor, 2017/01/13 04:19:02]

Done, thanks.

+      focus_manager->AdvanceFocus(false);
+  }
   return !!v;

[sky, 2017/01/12 16:34:13]

The return value should be true if any view got focus.

[Patti Lor, 2017/01/13 04:19:02]

Done.

 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, ui::EventSource implementation:
 ui::EventProcessor* Widget::GetEventProcessor() {
   return root_view_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, FocusTraversable implementation:
@@ skipping 162 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views