Restrict the new button style to the new dialog style flag.

ui/views/controls/button/label_button.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/controls/button/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/focus_border.h"
+#include "ui/views/window/dialog_delegate.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme_win.h"
 #endif
 
 namespace {
 
 // The spacing between the icon and text.
 const int kSpacing = 5;
@@ skipping 101 matching lines @@
   if (style_ == STYLE_BUTTON) {
     int style = label_->font().GetStyle();
     style = is_default ? style | gfx::Font::BOLD : style & !gfx::Font::BOLD;
     label_->SetFont(label_->font().DeriveFont(0, style));
   }
 }
 
 void LabelButton::SetStyle(ButtonStyle style) {
   // Use the new button style instead of the native button style.
   // TODO(msw): Officialy deprecate and remove STYLE_NATIVE_TEXTBUTTON.
-  if (style == STYLE_NATIVE_TEXTBUTTON)
+  if (DialogDelegate::UseNewStyle() && style == STYLE_NATIVE_TEXTBUTTON)
     style = STYLE_BUTTON;
 
   style_ = style;
   set_border(new LabelButtonBorder(style));
   // Inset the button focus rect from the actual border; roughly match Windows.
   if (style == STYLE_TEXTBUTTON || style == STYLE_NATIVE_TEXTBUTTON)
     set_focus_border(FocusBorder::CreateDashedFocusBorder(3, 3, 3, 3));
   if (style == STYLE_BUTTON || style == STYLE_NATIVE_TEXTBUTTON) {
     label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     set_focusable(true);
@@ skipping 187 matching lines @@
   params->button.indeterminate = false;
   params->button.is_default = is_default_;
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
   params->button.has_border = style() == STYLE_NATIVE_TEXTBUTTON;
   params->button.classic_state = 0;
   params->button.background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 }  // namespace views