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

ui/views/window/dialog_delegate_unittest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_processor.h"
@@ skipping 31 matching lines @@
     // not dependent on the order of AddAccelerator calls.
     EXPECT_FALSE(GetWidget());
     AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
   }
 
   // WidgetDelegate overrides:
   bool ShouldShowWindowTitle() const override {
     return !title_.empty();
   }
 
+  bool ShouldShowCloseButton() const override { return false; }
+
   // DialogDelegateView overrides:
   bool Cancel() override {
     canceled_ = true;
     return closeable_;
   }
   bool Accept() override {
     accepted_ = true;
     return closeable_;
   }
   bool Close() override {
@@ skipping 59 matching lines @@
 
 class DialogTest : public ViewsTestBase {
  public:
   DialogTest() : dialog_(nullptr) {}
   ~DialogTest() override {}
 
   void SetUp() override {
     ViewsTestBase::SetUp();
     dialog_ = new TestDialog();
     dialog_->Init();
-    DialogDelegate::CreateDialogWidget(dialog_, GetContext(), nullptr)->Show();
+    DialogDelegate::CreateDialogWidget(dialog_, GetContext(), nullptr);
   }
 
   void TearDown() override {
     dialog_->TearDown();
     ViewsTestBase::TearDown();
   }
 
   void SimulateKeyEvent(const ui::KeyEvent& event) {
     ui::KeyEvent event_copy = event;
     if (dialog()->GetFocusManager()->OnKeyEvent(event_copy))
       dialog()->GetWidget()->OnKeyEvent(&event_copy);
   }
 
+  void ShowDialog() { dialog()->GetWidget()->Show(); }
+
   TestDialog* dialog() const { return dialog_; }
 
  private:
   TestDialog* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogTest);
 };
 
 }  // namespace
 
 TEST_F(DialogTest, AcceptAndCancel) {
+  ShowDialog();
   DialogClientView* client_view = dialog()->GetDialogClientView();
   LabelButton* ok_button = client_view->ok_button();
   LabelButton* cancel_button = client_view->cancel_button();
 
   // Check that return/escape accelerators accept/close dialogs.
   EXPECT_EQ(dialog()->input(), dialog()->GetFocusManager()->GetFocusedView());
   const ui::KeyEvent return_event(
       ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE);
   SimulateKeyEvent(return_event);
   dialog()->CheckAndResetStates(false, true, false, nullptr);
@@ skipping 14 matching lines @@
   SimulateKeyEvent(return_event);
   dialog()->CheckAndResetStates(true, false, false, nullptr);
 
   // Check that escape can be overridden.
   dialog()->set_should_handle_escape(true);
   SimulateKeyEvent(escape_event);
   dialog()->CheckAndResetStates(false, false, false, nullptr);
 }
 
 TEST_F(DialogTest, RemoveDefaultButton) {
+  ShowDialog();
   // Removing buttons from the dialog here should not cause a crash on close.
   delete dialog()->GetDialogClientView()->ok_button();
   delete dialog()->GetDialogClientView()->cancel_button();
 }
 
 TEST_F(DialogTest, HitTest_HiddenTitle) {
+  ShowDialog();
   // Ensure that BubbleFrameView hit-tests as expected when the title is hidden.
   const NonClientView* view = dialog()->GetWidget()->non_client_view();
   BubbleFrameView* frame = static_cast<BubbleFrameView*>(view->frame_view());
   const int border = frame->bubble_border()->GetBorderThickness();
 
   struct {
     const int point;
     const int hit;
   } cases[] = {
     { border,      HTSYSMENU },
     { border + 10, HTSYSMENU },
     { border + 20, HTCLIENT  },
     { border + 50, HTCLIENT  },
     { border + 60, HTCLIENT  },
     { 1000,        HTNOWHERE },
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     gfx::Point point(cases[i].point, cases[i].point);
     EXPECT_EQ(cases[i].hit, frame->NonClientHitTest(point))
         << " case " << i << " with border: " << border << ", at point "
         << cases[i].point;
   }
 }
 
 TEST_F(DialogTest, HitTest_WithTitle) {
+  ShowDialog();
   // Ensure that BubbleFrameView hit-tests as expected when the title is shown.
   const NonClientView* view = dialog()->GetWidget()->non_client_view();
   dialog()->set_title(base::ASCIIToUTF16("Title"));
   dialog()->GetWidget()->UpdateWindowTitle();
   BubbleFrameView* frame = static_cast<BubbleFrameView*>(view->frame_view());
   const int border = frame->bubble_border()->GetBorderThickness();
 
   struct {
     const int point;
     const int hit;
   } cases[] = {
     { border,      HTSYSMENU },
     { border + 10, HTSYSMENU },
     { border + 20, HTCAPTION },
     { border + 50, HTCLIENT  },
     { border + 60, HTCLIENT  },
     { 1000,        HTNOWHERE },
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     gfx::Point point(cases[i].point, cases[i].point);
     EXPECT_EQ(cases[i].hit, frame->NonClientHitTest(point))
         << " with border: " << border << ", at point " << cases[i].point;
   }
 }
 
 TEST_F(DialogTest, BoundsAccommodateTitle) {
+  ShowDialog();
   TestDialog* dialog2(new TestDialog());
   dialog2->set_title(base::ASCIIToUTF16("Title"));
   DialogDelegate::CreateDialogWidget(dialog2, GetContext(), nullptr);
 
   // Titled dialogs have taller initial frame bounds than untitled dialogs.
   View* frame1 = dialog()->GetWidget()->non_client_view()->frame_view();
   View* frame2 = dialog2->GetWidget()->non_client_view()->frame_view();
   EXPECT_LT(frame1->GetPreferredSize().height(),
             frame2->GetPreferredSize().height());
 
   // Giving the default test dialog a title will yield the same bounds.
   dialog()->set_title(base::ASCIIToUTF16("Title"));
   dialog()->GetWidget()->UpdateWindowTitle();
   EXPECT_EQ(frame1->GetPreferredSize().height(),
             frame2->GetPreferredSize().height());
 
   dialog2->TearDown();
 }
 
 // Tests default focus is assigned correctly when showing a new dialog.
 TEST_F(DialogTest, InitialFocus) {
+  ShowDialog();
   EXPECT_TRUE(dialog()->input()->HasFocus());
   EXPECT_EQ(dialog()->input(), dialog()->GetFocusManager()->GetFocusedView());
 }
 
+// If the initially focused View provided is unfocusable, check the next
+// available focusable View is focused.
+TEST_F(DialogTest, UnfocusableInitialFocus) {
+  DialogDelegateView* dialog = new DialogDelegateView();
+  Textfield* textfield = new Textfield();
+  dialog->AddChildView(textfield);
+  Widget* dialog_widget =
+      DialogDelegate::CreateDialogWidget(dialog, GetContext(), nullptr);
+
+  // Turn off focusability on all the dialog's buttons. On Mac, we can just do
+  // this by turning off full keyboard access. On non-Mac, this will have no
+  // effect - turn off focusability for Views there manually.
+  SetFullKeyboardAccessState(dialog_widget, false);

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

if you do this before creating the widget, I think you can avoid having to do
updateFullKeyboardAccess (and, not have to pass in a pointer to widget -- i.e.
just use
ScopedFakeFullKeyboardAccess::GetInstance()->set_full_keyboard_access_state(false);

[Patti Lor, 2017/01/12 06:12:37]

Oh, that works! Thanks, reverted stuff back.

+#if !defined(OS_MACOSX)
+  DialogClientView* dcv = dialog->GetDialogClientView();
+  dcv->ok_button()->SetFocusBehavior(View::FocusBehavior::NEVER);
+  dcv->cancel_button()->SetFocusBehavior(View::FocusBehavior::NEVER);
+#endif
+
+  // On showing the dialog, the initially focused View will be the OK button.
+  // Since it is no longer focusable, focus should advance to the next focusable
+  // View, which is |textfield|.
+  dialog_widget->Show();
+  EXPECT_TRUE(textfield->HasFocus());
+  EXPECT_EQ(textfield, dialog->GetFocusManager()->GetFocusedView());
+  dialog_widget->Close();
+}
+
 }  // namespace views