Restore 'Chrome Style' buttons for --enable-new-dialog-style dialogs.

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/chrome_style.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
 namespace {
 
 // The group used by the buttons.  This name is chosen voluntarily big not to
@@ skipping 262 matching lines @@
   UpdateDialogButtons();
 
   // Use the escape key to close the window if there are no dialog buttons.
   if (!has_dialog_buttons())
     AddAccelerator(escape);
 }
 
 TextButton* DialogClientView::CreateDialogButton(ui::DialogButton type) {
   const string16 title = GetDialogDelegate()->GetDialogButtonLabel(type);
   TextButton* button = NULL;
-  if (DialogDelegate::UseNewStyle())
+  if (DialogDelegate::UseNewStyle()) {
     button = new TextButton(this, title);
-  else
+    ApplyChromeStyle(button);
+  } else {
     button = new NativeTextButton(this, title);
+  }
   const int kDialogMinButtonWidth = 75;
   button->set_min_width(kDialogMinButtonWidth);
   button->SetGroup(kButtonGroup);
   if (type == GetDialogDelegate()->GetDefaultDialogButton()) {
     default_button_ = button;
     button->SetIsDefault(true);
   }
   return button;
 }
 
@@ skipping 26 matching lines @@
 DialogDelegate* DialogClientView::GetDialogDelegate() const {
   return GetWidget()->widget_delegate()->AsDialogDelegate();
 }
 
 void DialogClientView::Close() {
   GetWidget()->Close();
   GetDialogDelegate()->OnClose();
 }
 
 }  // namespace views