Ensure default dialog button focus remains after a dialog update.

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 "ui/views/window/dialog_client_view.h"
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 123 matching lines @@
 
   // Set a longer than normal Cancel label so that the minimum button width is
   // exceeded. The resulting width is around 160 pixels, but depends on system
   // fonts.
   void SetLongCancelLabel() {
     cancel_label_ = base::ASCIIToUTF16("Cancel Cancel Cancel");
   }
 
   DialogClientView* client_view() { return client_view_; }
 
+  Widget* widget() { return widget_; }
+
  private:
   // The dialog Widget.
   Widget* widget_ = nullptr;
 
   // The DialogClientView that's being tested. Owned by |widget_|.
   DialogClientView* client_view_;
 
   // The bitmask of buttons to show in the dialog.
   int dialog_buttons_ = ui::DIALOG_BUTTON_NONE;
 
@@ skipping 275 matching lines @@
                      gfx::Size(666, 666));
   SetDialogButtons(ui::DIALOG_BUTTON_OK);
   client_view()->SizeToPreferredSize();
   client_view()->Layout();
   EXPECT_EQ(contents_width - button_row_inset,
             client_view()->ok_button()->bounds().right());
   EXPECT_EQ(contents_height + button_row_inset,
             height() + client_view()->ok_button()->y());
 }
 
+// Ensures that the focus of the button remains after a dialog update.
+TEST_F(DialogClientViewTest, FocusUpdate) {
+  // Test with just an ok button.
+  widget()->Show();
+  SetDialogButtons(ui::DIALOG_BUTTON_OK);
+  EXPECT_FALSE(client_view()->ok_button()->HasFocus());
+  client_view()->ok_button()->RequestFocus();  // Set focus.
+  EXPECT_TRUE(client_view()->ok_button()->HasFocus());
+  client_view()->UpdateDialogButtons();
+  EXPECT_TRUE(client_view()->ok_button()->HasFocus());
+}
+
+// Ensures that the focus of the button remains after a dialog update that
+// contains multiple buttons.
+TEST_F(DialogClientViewTest, FocusMultipleButtons) {
+  // Test with ok and cancel buttons.
+  widget()->Show();
+  SetDialogButtons(ui::DIALOG_BUTTON_CANCEL | ui::DIALOG_BUTTON_OK);
+  EXPECT_FALSE(client_view()->ok_button()->HasFocus());
+  EXPECT_FALSE(client_view()->cancel_button()->HasFocus());
+  client_view()->cancel_button()->RequestFocus();  // Set focus.
+  EXPECT_FALSE(client_view()->ok_button()->HasFocus());
+  EXPECT_TRUE(client_view()->cancel_button()->HasFocus());
+  client_view()->UpdateDialogButtons();
+  EXPECT_TRUE(client_view()->cancel_button()->HasFocus());
+}
+
 }  // namespace views