Change new-style default dialog buttons on focus too.

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 "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 128 matching lines @@
 DialogClientView* DialogClientView::AsDialogClientView() {
   return this;
 }
 
 const DialogClientView* DialogClientView::AsDialogClientView() const {
   return this;
 }
 
 void DialogClientView::OnWillChangeFocus(View* focused_before,
                                          View* focused_now) {
-  // New style dialogs do not move the default button with the focus.
-  // TODO(msw|wittman): Remove this functionality once the new style has landed.
-  if (DialogDelegate::UseNewStyle())
-    return;
-
   // Make the newly focused button default or restore the dialog's default.
   const int default_button = GetDialogDelegate()->GetDefaultDialogButton();
   LabelButton* new_default_button = NULL;
   if (focused_now &&
       !strcmp(focused_now->GetClassName(), LabelButton::kViewClassName)) {
     new_default_button = static_cast<LabelButton*>(focused_now);
   } else if (default_button == ui::DIALOG_BUTTON_OK && ok_button_) {
     new_default_button = ok_button_;
   } else if (default_button == ui::DIALOG_BUTTON_CANCEL && cancel_button_) {
     new_default_button = cancel_button_;
@@ skipping 222 matching lines @@
       gfx::Insets(0, kButtonHEdgeMargin,
                   kButtonVEdgeMargin, kButtonHEdgeMargin);
 }
 
 void DialogClientView::Close() {
   GetWidget()->Close();
   GetDialogDelegate()->OnClose();
 }
 
 }  // namespace views