DialogClientView: Correct the order in which subviews are focused.

ui/views/window/dialog_client_view_unittest.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 "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/test/test_views.h"
@@ skipping 158 matching lines @@
   EXPECT_EQ(NULL, client_view()->ok_button());
   delete client_view()->cancel_button();
   EXPECT_EQ(NULL, client_view()->cancel_button());
 
   // Updating should restore the requested buttons properly.
   SetDialogButtons(ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL);
   EXPECT_TRUE(client_view()->ok_button()->is_default());
   EXPECT_FALSE(client_view()->cancel_button()->is_default());
 }
 
+// Test that views inside the dialog client view have the correct focus order.
+TEST_F(DialogClientViewTest, SetupFocusChain) {
+#if defined(OS_WIN) || defined(OS_CHROMEOS)
+  const bool kIsOkButtonOnLeftSide = true;
+#else
+  const bool kIsOkButtonOnLeftSide = false;
+#endif
+
+  // Initially the dialog client view only contains the content view.
+  EXPECT_EQ(nullptr, client_view()->GetContentsView()->GetNextFocusableView());
+
+  // Add OK and cancel buttons.
+  SetDialogButtons(ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL);
+
+  if (kIsOkButtonOnLeftSide) {
+    EXPECT_EQ(client_view()->ok_button(),
+              client_view()->GetContentsView()->GetNextFocusableView());
+    EXPECT_EQ(client_view()->cancel_button(),
+              client_view()->ok_button()->GetNextFocusableView());
+    EXPECT_EQ(nullptr, client_view()->cancel_button()->GetNextFocusableView());
+  } else {
+    EXPECT_EQ(client_view()->cancel_button(),
+              client_view()->GetContentsView()->GetNextFocusableView());
+    EXPECT_EQ(client_view()->ok_button(),
+              client_view()->cancel_button()->GetNextFocusableView());
+    EXPECT_EQ(nullptr, client_view()->ok_button()->GetNextFocusableView());
+  }
+
+  // Add extra view and remove OK button.
+  View* extra_view = new StaticSizedView(gfx::Size(200, 200));
+  SetExtraView(extra_view);
+  SetDialogButtons(ui::DIALOG_BUTTON_CANCEL);
+
+  EXPECT_EQ(extra_view,
+            client_view()->GetContentsView()->GetNextFocusableView());
+  EXPECT_EQ(client_view()->cancel_button(), extra_view->GetNextFocusableView());
+  EXPECT_EQ(nullptr, client_view()->cancel_button()->GetNextFocusableView());
+}
+
 // Test that the contents view gets its preferred size in the basic dialog
 // configuration.
 TEST_F(DialogClientViewTest, ContentsSize) {
   CheckContentsIsSetToPreferredSize();
   EXPECT_EQ(GetContentsView()->bounds().bottom(),
             client_view()->bounds().bottom());
 }
 
 // Test the effect of the button strip on layout.
 TEST_F(DialogClientViewTest, LayoutWithButtons) {
@@ skipping 61 matching lines @@
 
   View* footnote_view = new ProportionallySizedView(3);
   SetFootnoteView(footnote_view);
   CheckContentsIsSetToPreferredSize();
   EXPECT_GT(client_view()->bounds().height(), no_footnote_size.height());
   EXPECT_EQ(footnote_view->bounds().width() * 3,
             footnote_view->bounds().height());
 }
 
 }  // namespace views