Remove DialogDelegate::UseNewStyle and unused code.

ui/views/window/dialog_delegate.h

 // 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.
 
 #ifndef UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_
 #define UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "ui/base/accessibility/accessibility_types.h"
@@ skipping 13 matching lines @@
 //  dialog box Window. The window that is displayed uses this interface to
 //  determine how it should be displayed and notify the delegate object of
 //  certain events.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT DialogDelegate : public ui::DialogModel,
                                     public WidgetDelegate {
  public:
   virtual ~DialogDelegate();
 
-  // Returns whether to use the new dialog style in general.
-  // See UseNewStyleForThisDialog() for dialog-specific styling.
-  // TODO(msw): Remove this. The new dialog style is always on by default.
-  static bool UseNewStyle();
-
   // Create a |dialog| window Widget with the specified |context| or |parent|.
   static Widget* CreateDialogWidget(DialogDelegate* dialog,
                                     gfx::NativeWindow context,
                                     gfx::NativeWindow parent);
 
   // Override this function to display an extra view adjacent to the buttons.
   // Overrides may construct the view; this will only be called once per dialog.
   virtual View* CreateExtraView();
 
   // Override this function to display an extra view in the titlebar.
@@ skipping 39 matching lines @@
       ui::DialogButton button) const OVERRIDE;
   virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
 
   // Overridden from WidgetDelegate:
   virtual View* GetInitiallyFocusedView() OVERRIDE;
   virtual DialogDelegate* AsDialogDelegate() OVERRIDE;
   virtual ClientView* CreateClientView(Widget* widget) OVERRIDE;
   virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) OVERRIDE;
 
   // Create a frame view using the new dialog style.
-  static NonClientFrameView* CreateNewStyleFrameView(Widget* widget);
+  static NonClientFrameView* CreateDialogFrameView(Widget* widget);
   // The semi-transparent border and shadow of the new style frame view does not
   // work on child windows under Views/Win32. This is a kludge to get a
   // reasonable-looking opaque border for the dialog. Note that this does not
   // support arrows.
   //
   // TODO(wittman): Remove once WinAura is in place.
-  static NonClientFrameView* CreateNewStyleFrameView(Widget* widget,
-                                                     bool force_opaque_border);
+  static NonClientFrameView* CreateDialogFrameView(Widget* widget,
+                                                   bool force_opaque_border);
 
   // Returns whether this particular dialog should use the new dialog style.
   virtual bool UseNewStyleForThisDialog() const;
 
   // Called when the window has been closed.
   virtual void OnClosed() {}
 
   // A helper for accessing the DialogClientView object contained by this
   // delegate's Window.
   const DialogClientView* GetDialogClientView() const;
@@ skipping 20 matching lines @@
   virtual const Widget* GetWidget() const OVERRIDE;
   virtual View* GetContentsView() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DialogDelegateView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_