DialogClientView: Correct the order in which subviews are focused.

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/events/keycodes/keyboard_codes.h"
@@ skipping 238 matching lines @@
   if (details.is_add && details.child == this) {
     UpdateDialogButtons();
     CreateExtraView();
     CreateFootnoteView();
   } else if (!details.is_add && details.child != this) {
     if (details.child == ok_button_)
       ok_button_ = NULL;
     if (details.child == cancel_button_)
       cancel_button_ = NULL;
   }
+
+  SetupFocusChain();
 }
 
 void DialogClientView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   // The old dialog style needs an explicit background color, while the new
   // dialog style simply inherits the bubble's frame view color.
   const DialogDelegate* dialog = GetDialogDelegate();
 
   if (dialog && !dialog->UseNewStyleForThisDialog()) {
     set_background(views::Background::CreateSolidBackground(GetNativeTheme()->
         GetSystemColor(ui::NativeTheme::kColorId_DialogBackground)));
@@ skipping 104 matching lines @@
   return GetButtonsAndExtraViewRowHeight() == 0 ? gfx::Insets() :
       gfx::Insets(0, kButtonHEdgeMarginNew,
                   kButtonVEdgeMarginNew, kButtonHEdgeMarginNew);
 }
 
 void DialogClientView::Close() {
   GetWidget()->Close();
   GetDialogDelegate()->OnClosed();
 }
 
+void DialogClientView::SetupFocusChain() {
+  // Create a vector of child views in the order of intended focus.
+  std::vector<View*> child_views;
+  child_views.push_back(contents_view());
+  child_views.push_back(extra_view_);
+  if (kIsOkButtonOnLeftSide) {
+    child_views.push_back(ok_button_);
+    child_views.push_back(cancel_button_);
+  } else {
+    child_views.push_back(cancel_button_);
+    child_views.push_back(ok_button_);
+  }
+  child_views.push_back(footnote_view_);
+
+  // Remove all null views from the vector.
+  child_views.erase(
+      std::remove(child_views.begin(), child_views.end(), nullptr),
+      child_views.end());
+
+  // Add a dummy null view, so that the last view has null as the next focusable
+  // view.
+  child_views.push_back(nullptr);

[sky, 2016/02/17 18:18:26]

I actually prefer you don't do this. Otherwise we have to worry about signed
overflow on 409.

[karandeepb, 2016/02/18 01:44:59]

Done.

+
+  // Setup focus.
+  for (size_t i = 0; i < child_views.size() - 1; i++)
+    child_views[i]->SetNextFocusableView(child_views[i + 1]);
+}
+
 }  // namespace views