Remove DialogDelegate::UseNewStyle and unused code.

ui/views/window/dialog_delegate.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_delegate.h"
 
 #include "base/logging.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_client_view.h"
 
 #if defined(USE_AURA)
 #include "ui/views/corewm/shadow_types.h"
 #endif
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogDelegate:
 
 DialogDelegate::~DialogDelegate() {
 }
 
 // static
-bool DialogDelegate::UseNewStyle() {
-  return true;
-}
-
-// static
 Widget* DialogDelegate::CreateDialogWidget(DialogDelegate* dialog,
                                            gfx::NativeWindow context,
                                            gfx::NativeWindow parent) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.delegate = dialog;
   if (!dialog || dialog->UseNewStyleForThisDialog()) {
     params.opacity = Widget::InitParams::TRANSLUCENT_WINDOW;
     params.remove_standard_frame = true;
   }
@@ skipping 101 matching lines @@
 DialogDelegate* DialogDelegate::AsDialogDelegate() {
   return this;
 }
 
 ClientView* DialogDelegate::CreateClientView(Widget* widget) {
   return new DialogClientView(widget, GetContentsView());
 }
 
 NonClientFrameView* DialogDelegate::CreateNonClientFrameView(Widget* widget) {
   if (UseNewStyleForThisDialog())
-    return CreateNewStyleFrameView(widget);
+    return CreateDialogFrameView(widget);
   return WidgetDelegate::CreateNonClientFrameView(widget);
 }
 
 // static
-NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
-  return CreateNewStyleFrameView(widget, false);
+NonClientFrameView* DialogDelegate::CreateDialogFrameView(Widget* widget) {
+  return CreateDialogFrameView(widget, false);
 }
 
 // static
-NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(
+NonClientFrameView* DialogDelegate::CreateDialogFrameView(
     Widget* widget,
     bool force_opaque_border) {
   BubbleFrameView* frame = new BubbleFrameView(gfx::Insets());
   const SkColor color = widget->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground);
   if (force_opaque_border) {
     frame->SetBubbleBorder(new BubbleBorder(
         BubbleBorder::NONE,
         BubbleBorder::NO_SHADOW_OPAQUE_BORDER,
         color));
@@ skipping 11 matching lines @@
   if (force_opaque_border)
     widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
 #if defined(USE_AURA)
   // TODO(msw): Add a matching shadow type and remove the bubble frame border?
   corewm::SetShadowType(widget->GetNativeWindow(), corewm::SHADOW_TYPE_NONE);
 #endif
   return frame;
 }
 
 bool DialogDelegate::UseNewStyleForThisDialog() const {
-  return UseNewStyle();
+  return true;
 }
 
 const DialogClientView* DialogDelegate::GetDialogClientView() const {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
 DialogClientView* DialogDelegate::GetDialogClientView() {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
@@ skipping 21 matching lines @@
 
 const Widget* DialogDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 View* DialogDelegateView::GetContentsView() {
   return this;
 }
 
 }  // namespace views