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

ui/views/window/dialog_client_view.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_CLIENT_VIEW_H_
 #define UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/focus/focus_manager.h"
@@ skipping 17 matching lines @@
 //  embedded contents view to provide extra UI to be shown in the row of
 //  buttons.
 //
 //  DialogClientView also provides the ability to set an arbitrary view that is
 //  positioned beneath the buttons.
 //
 class VIEWS_EXPORT DialogClientView : public ClientView,
                                       public ButtonListener,
                                       public FocusChangeListener {
  public:
-  // Parameters for the internal dialog styling.  Default construction
-  // produces parameters for native dialog styling.
-  struct VIEWS_EXPORT StyleParams {
-    StyleParams();
-
-    int button_vedge_margin;
-    int button_hedge_margin;
-    int button_shadow_margin;
-    int button_content_spacing;
-    int related_button_hspacing;
-  };
-
-  DialogClientView(Widget* widget,
-                   View* contents_view,
-                   const StyleParams &params);
+  DialogClientView(Widget* widget, View* contents_view);
   virtual ~DialogClientView();
 
   // Adds the dialog buttons required by the supplied DialogDelegate to the
   // view.
   void ShowDialogButtons();
 
   // Updates the enabled state and label of the buttons required by the
   // supplied DialogDelegate
   void UpdateDialogButtons();
 
   // Accept the changes made in the window that contains this ClientView.
   void AcceptWindow();
 
   // Cancel the changes made in the window that contains this ClientView.
   void CancelWindow();
 
   // Accessors in case the user wishes to adjust these buttons.
   TextButton* ok_button() const { return ok_button_; }
   TextButton* cancel_button() const { return cancel_button_; }
 
-  // Creates a StyleParams struct in Chrome style (default is native style).
-  static StyleParams GetChromeStyleParams();
-
   // Returns the number of pixels at the bottom of the dialog which are visually
   // part of the frame, but are actually rendered by the DialogClientView.
   int GetBottomMargin();
 
   // Overridden from View:
   virtual void NativeViewHierarchyChanged(
       bool attached,
       gfx::NativeView native_view,
       internal::RootView* root_view) OVERRIDE;
 
@@ skipping 17 matching lines @@
   virtual void ViewHierarchyChanged(bool is_add, View* parent,
                                     View* child) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
   // ButtonListener implementation:
   virtual void ButtonPressed(Button* sender,
                              const ui::Event& event) OVERRIDE;
 
  private:
+  // Parameters for the internal dialog styling.
+  struct StyleParams {
+    StyleParams();
+
+    int button_vedge_margin;
+    int button_hedge_margin;
+    int button_shadow_margin;
+    int button_content_spacing;
+    int related_button_hspacing;
+  };
+
   // Create a dialog button of the appropriate type.
   TextButton* CreateDialogButton(ui::DialogButton type, const string16& title);
 
   // Paint the size box in the bottom right corner of the window if it is
   // resizable.
   void PaintSizeBox(gfx::Canvas* canvas);
 
   // Returns the greater of ok and cancel button's preferred height.
   int GetButtonsHeight() const;
 
@@ skipping 54 matching lines @@
 
   // When ancestor gets changed focus manager gets changed as well.
   FocusManager* saved_focus_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_