Ensure default dialog button focus remains after a dialog update.

ui/views/window/dialog_client_view.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 <algorithm>
 
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 301 matching lines @@
   View* third = ok_button_;
   if (kIsOkButtonOnLeftSide)
     std::swap(second, third);
   return {{first, second, third}};
 }
 
 void DialogClientView::SetupLayout() {
   base::AutoReset<bool> auto_reset(&adding_or_removing_views_, true);
   GridLayout* layout = new GridLayout(button_row_container_);
   layout->set_minimum_size(minimum_size_);
+  default_focus_ = GetDialogDelegate()->GetInitiallyFocusedView();
 
   // Clobber any existing LayoutManager since it has weak references to child
   // Views which may be removed by SetupViews().
   button_row_container_->SetLayoutManager(layout);
   SetupViews();
   const std::array<View*, kNumButtons> views = GetButtonRowViews();
 
   // Visibility changes on |extra_view_| must be observed to re-Layout. However,
   // when hidden it's not included in the button row (it can't influence layout)
   // and it can't be added to |button_row_container_| (GridLayout complains).
@@ skipping 60 matching lines @@
   }
 
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     // Only link the extra view column if it is a button.
     if (views[0] && !CustomButton::AsCustomButton(views[0]))
       column_set->LinkColumnSizes(link[1], link[2], -1);
     else
       column_set->LinkColumnSizes(link[0], link[1], link[2], -1);
   }
   layout->AddPaddingRow(kFixed, insets.bottom());
+
+  if (default_focus_) {
+    default_focus_->RequestFocus();

[Devlin, 2017/04/12 19:36:31]

Maybe add a comment why we need to do this.

[Ackerman, 2017/04/28 18:22:59]

Done.

+  }
 }
 
 void DialogClientView::SetupViews() {
   button_row_container_->RemoveAllChildViews(false /* delete children */);
   // If SetupLayout() "stored" a hidden |extra_view_| in |this|, ensure it can
   // be re-added to the layout when becoming visible.
   if (extra_view_)
     RemoveChildView(extra_view_);
 
   UpdateDialogButton(&ok_button_, ui::DIALOG_BUTTON_OK);
   UpdateDialogButton(&cancel_button_, ui::DIALOG_BUTTON_CANCEL);
 
   if (extra_view_)
     return;
 
   extra_view_ = GetDialogDelegate()->CreateExtraView();
   if (extra_view_)
     extra_view_->SetGroup(kButtonGroup);
 }
 
 }  // namespace views