Move ash/wm's DialogFrameView to ui/views/window; etc.

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/string16.h"
 #include "ui/base/accessibility/accessibility_types.h"
@@ skipping 10 matching lines @@
 // DialogDelegate
 //
 //  DialogDelegate is an interface implemented by objects that wish to show a
 //  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 WidgetDelegate {
  public:
+  // Returns whether to use the new dialog style.
+  static bool UseNewStyle();

[sky, 2012/12/19 15:55:54]

constructor/destructor before other methods.

[msw, 2012/12/19 17:07:33]

Done.

+
   virtual DialogDelegate* AsDialogDelegate() OVERRIDE;
 
   virtual ~DialogDelegate();
 
   // Returns a mask specifying which of the available DialogButtons are visible
   // for the dialog. Note: If an OK button is provided, you should provide a
   // CANCEL button. A dialog box with just an OK button is frowned upon and
   // considered a very special case, so if you're planning on including one,
   // you should reconsider, or beng says there will be stabbings.
   //
@@ skipping 10 matching lines @@
 
   // Returns the label of the specified dialog button.
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const;
 
   // Returns whether the specified dialog button is enabled.
   virtual bool IsDialogButtonEnabled(ui::DialogButton button) const;
 
   // Returns whether the specified dialog button is visible.
   virtual bool IsDialogButtonVisible(ui::DialogButton button) const;
 
-  // Returns whether to use chrome style for the button strip (like WebUI). If
-  // false, native style padding is used.
-  virtual bool UseChromeStyle() const;
-
   // Returns whether accelerators are enabled on the button. This is invoked
   // when an accelerator is pressed, not at construction time. This
   // returns true.
   virtual bool AreAcceleratorsEnabled(ui::DialogButton button);
 
   // Override this function if with a view which will be shown in the same
   // row as the OK and CANCEL buttons but flush to the left and extending
   // up to the buttons.
   virtual View* GetExtraView();
 
@@ skipping 16 matching lines @@
   // true if the window can be closed after it returns, or false if it must
   // remain open.  If |window_closing| is true, it means that this handler is
   // being called because the window is being closed (e.g.  by Window::Close)
   // and there is no Cancel handler, so Accept is being called instead.
   virtual bool Accept(bool window_closing);
   virtual bool Accept();
 
   // Overridden from WindowDelegate:
   virtual View* GetInitiallyFocusedView() OVERRIDE;
   virtual ClientView* CreateClientView(Widget* widget) OVERRIDE;
+  virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) OVERRIDE;
 
   // Called when the window has been closed.
   virtual void OnClose() {}
 
   // A helper for accessing the DialogClientView object contained by this
   // delegate's Window.
   const DialogClientView* GetDialogClientView() const;
   DialogClientView* GetDialogClientView();
 
  protected:
   // Overridden from WindowDelegate:
   virtual ui::AccessibilityTypes::Role GetAccessibleWindowRole() const OVERRIDE;
 };
 
 // A DialogDelegate implementation that is-a View. Used to override GetWidget()
 // to call View's GetWidget() for the common case where a DialogDelegate
 // implementation is-a View.
 class VIEWS_EXPORT DialogDelegateView : public DialogDelegate,
                                         public View {
  public:
   DialogDelegateView();
   virtual ~DialogDelegateView();
 
   // Overridden from DialogDelegate:
   virtual Widget* GetWidget() OVERRIDE;
   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_