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

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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 95 matching lines @@
 template <> const char DialogButton<NativeTextButton>::kViewClassName[] =
     "NativeDialogButton";
 
 template <> const char DialogButton<TextButton>::kViewClassName[] =
     "TextDialogButton";
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, public:
 
-DialogClientView::StyleParams::StyleParams()
-    : button_vedge_margin(kButtonVEdgeMargin),
-      button_hedge_margin(kButtonHEdgeMargin),
-      button_shadow_margin(0),
-      button_content_spacing(kDialogButtonContentSpacing),
-      related_button_hspacing(kRelatedButtonHSpacing) {
-}
-
-DialogClientView::DialogClientView(Widget* owner,
-                                   View* contents_view,
-                                   const StyleParams &params)
+DialogClientView::DialogClientView(Widget* owner, View* contents_view)
     : ClientView(owner, contents_view),
-      style_params_(params),
       ok_button_(NULL),
       cancel_button_(NULL),
       default_button_(NULL),
       extra_view_(NULL),
       size_extra_view_height_to_buttons_(false),
       notified_delegate_(false),
       listening_to_focus_(false),
       saved_focus_manager_(NULL) {
   SkColor bg_color = owner->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground);
@@ skipping 48 matching lines @@
   }
 }
 
 void DialogClientView::OnWillChangeFocus(View* focused_before,
                                          View* focused_now) {
   // Chrome style dialogs do not move the default button with the focus.
   // TODO(wittman): Remove all support for updating the default button on focus
   // change once we move completely to Chrome style.  See
   // http://codereview.chromium.org/10230 for a rough idea of changes to be
   // undone.
-  if (GetDialogDelegate()->UseChromeStyle())
+  if (DialogDelegate::UseNewStyle())
     return;
 
   TextButton* new_default_button = NULL;
   // TODO(wittman): Identify TextButtons in a better way than
   // enumerating every possible subclass.
   if (focused_now &&
       ((focused_now->GetClassName() == NativeTextButton::kViewClassName) ||
        (focused_now->GetClassName() == TextButton::kViewClassName) ||
        (focused_now->GetClassName() ==
         DialogButton<NativeTextButton>::kViewClassName) ||
@@ skipping 45 matching lines @@
   }
 }
 
 void DialogClientView::CancelWindow() {
   // Call the standard Close handler, which checks with the delegate before
   // proceeding. This checking _isn't_ done here, but in the WM_CLOSE handler,
   // so that the close box on the window also shares this code path.
   Close();
 }
 
-// static
-DialogClientView::StyleParams DialogClientView::GetChromeStyleParams() {
-  StyleParams params;
-  params.button_vedge_margin = 0;
-  params.button_hedge_margin = 0;
-  params.button_shadow_margin = views::GetChromeStyleButtonShadowMargin();
-  params.button_content_spacing = 0;
-  params.related_button_hspacing = 10;
-  return params;
-}
-
 int DialogClientView::GetBottomMargin() {
   return style_params_.button_shadow_margin;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, View overrides:
 
 void DialogClientView::NativeViewHierarchyChanged(
     bool attached,
     gfx::NativeView native_view,
@@ skipping 127 matching lines @@
   } else if (sender == cancel_button_) {
     CancelWindow();
   } else {
     NOTREACHED();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, private:
 
+DialogClientView::StyleParams::StyleParams()
+    : button_vedge_margin(kButtonVEdgeMargin),
+      button_hedge_margin(kButtonHEdgeMargin),
+      button_shadow_margin(0),
+      button_content_spacing(kDialogButtonContentSpacing),
+      related_button_hspacing(kRelatedButtonHSpacing) {
+  if (DialogDelegate::UseNewStyle()) {
+    button_vedge_margin = 0;
+    button_hedge_margin = 0;
+    button_shadow_margin = GetChromeStyleButtonShadowMargin();
+    button_content_spacing = 0;
+    related_button_hspacing = 10;
+  }
+}
+
 TextButton* DialogClientView::CreateDialogButton(ui::DialogButton type,
                                                  const string16& title) {
   TextButton* button = NULL;
-  if (GetDialogDelegate()->UseChromeStyle())
+  if (DialogDelegate::UseNewStyle())
     button = new DialogButton<TextButton>(this, GetWidget(), type, title);
   else
     button = new DialogButton<NativeTextButton>(this, GetWidget(), type, title);
 
-  if (!GetDialogDelegate()->UseChromeStyle())
+  if (!DialogDelegate::UseNewStyle())
     button->set_min_width(kDialogMinButtonWidth);
 
   button->SetGroup(kButtonGroup);
 
   if (GetDialogDelegate()->GetDefaultDialogButton() & type) {
     default_button_ = button;
     button->SetIsDefault(true);
   }
 
-  if (GetDialogDelegate()->UseChromeStyle())
+  if (DialogDelegate::UseNewStyle())
     ApplyChromeStyle(button);
 
   return button;
 }
 
 void DialogClientView::PaintSizeBox(gfx::Canvas* canvas) {
   if (GetWidget()->widget_delegate()->CanResize() ||
       GetWidget()->widget_delegate()->CanMaximize()) {
 #if defined(OS_WIN)
     ui::NativeTheme* theme = GetNativeTheme();
@@ skipping 119 matching lines @@
   }
   saved_focus_manager_ = focus_manager;
   // Listen for focus change events so we can update the default button.
   if (focus_manager) {
     focus_manager->AddFocusChangeListener(this);
     listening_to_focus_ = true;
   }
 }
 
 }  // namespace views