Remove DialogDelegate::UseNewStyle and unused code.

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/events/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/blue_button.h"
@@ skipping 238 matching lines @@
   return true;
 }
 
 void DialogClientView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   ClientView::ViewHierarchyChanged(details);
   if (details.is_add && details.child == this) {
     // 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();
-    const bool use_new_style = dialog ?
-        dialog->UseNewStyleForThisDialog() : DialogDelegate::UseNewStyle();
-    if (!use_new_style)
+    if (dialog && !dialog->UseNewStyleForThisDialog())
       set_background(views::Background::CreateSolidBackground(GetNativeTheme()->
           GetSystemColor(ui::NativeTheme::kColorId_DialogBackground)));
 
     focus_manager_ = GetFocusManager();
     if (focus_manager_)
       GetFocusManager()->AddFocusChangeListener(this);
 
     UpdateDialogButtons();
     CreateExtraView();
     CreateFootnoteView();
@@ skipping 121 matching lines @@
 int DialogClientView::GetButtonsAndExtraViewRowHeight() const {
   int extra_view_height = ShouldShow(extra_view_) ?
       extra_view_->GetPreferredSize().height() : 0;
   int buttons_height = std::max(
       ok_button_ ? ok_button_->GetPreferredSize().height() : 0,
       cancel_button_ ? cancel_button_->GetPreferredSize().height() : 0);
   return std::max(extra_view_height, buttons_height);
 }
 
 gfx::Insets DialogClientView::GetButtonRowInsets() const {
-  if (GetButtonsAndExtraViewRowHeight() == 0)
-    return gfx::Insets();
-
   // NOTE: The insets only apply to the buttons, extra view, and footnote view.
-  return DialogDelegate::UseNewStyle() ?
+  return GetButtonsAndExtraViewRowHeight() == 0 ? gfx::Insets() :
       gfx::Insets(0, kButtonHEdgeMarginNew,
-                  kButtonVEdgeMarginNew, kButtonHEdgeMarginNew) :
-      gfx::Insets(0, kButtonHEdgeMargin,
-                  kButtonVEdgeMargin, kButtonHEdgeMargin);
+                  kButtonVEdgeMarginNew, kButtonHEdgeMarginNew);
 }
 
 void DialogClientView::Close() {
   GetWidget()->Close();
   GetDialogDelegate()->OnClosed();
 }
 
 }  // namespace views