(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();
+  if (!focus_manager)
+    return false;

[tapted, 2017/01/06 11:45:15]

oh drat - I missed that this early exit would change the return value for that
codepath :/

I think HWNDMessageHandler::ShowWindowWithState(..) is the only thing using the
return value. I don't know enough about that code to know if we can change the
return value in this case. We probably shouldn't (but sky might know better)

[Patti Lor, 2017/01/12 02:16:22]

Yeah, I read the comment description for this method and it says

  // Returns true if the initial focus has been set or the window should
  // not set the initial focus, or false if the caller should set the initial
  // focus (if any).

Which kind of suggests that we shouldn't change it, but then I feel like it also
suggests the "fallback" implemented in this patch shouldn't be in the scope of
this method either. :/ I've reverted the early return here but will link sky
these comments.

[tapted, 2017/01/12 02:25:43]

yep - this seems good/safest

+
   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->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 (v != focus_manager->GetFocusedView())
+      focus_manager->AdvanceFocus(false);
+  }
   return !!v;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, ui::EventSource implementation:
 ui::EventProcessor* Widget::GetEventProcessor() {
   return root_view_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 163 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views