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

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/command_line.h"
 #include "base/logging.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
+#include "ui/views/window/dialog_frame_view.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogDelegate:
 
+// static
+bool DialogDelegate::UseNewStyle() {
+  static const bool use_new_style = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableNewDialogStyle);
+  return use_new_style;
+}
+
 DialogDelegate* DialogDelegate::AsDialogDelegate() { return this; }
 
 DialogDelegate::~DialogDelegate() {
 }
 
 int DialogDelegate::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 }
 
 int DialogDelegate::GetDefaultDialogButton() const {
@@ skipping 11 matching lines @@
 }
 
 bool DialogDelegate::IsDialogButtonEnabled(ui::DialogButton button) const {
   return true;
 }
 
 bool DialogDelegate::IsDialogButtonVisible(ui::DialogButton button) const {
   return true;
 }
 
-bool DialogDelegate::UseChromeStyle() const {
-  return false;
-}
-
 bool DialogDelegate::AreAcceleratorsEnabled(ui::DialogButton button) {
   return true;
 }
 
 View* DialogDelegate::GetExtraView() {
   return NULL;
 }
 
 bool DialogDelegate::GetSizeExtraViewHeightToButtons() {
   return false;
@@ skipping 25 matching lines @@
   }
 
   if (default_button & ui::DIALOG_BUTTON_OK)
     return dcv->ok_button();
   if (default_button & ui::DIALOG_BUTTON_CANCEL)
     return dcv->cancel_button();
   return NULL;
 }
 
 ClientView* DialogDelegate::CreateClientView(Widget* widget) {
-  DialogClientView::StyleParams params = UseChromeStyle() ?
-      DialogClientView::GetChromeStyleParams() :
-      DialogClientView::StyleParams();
+  return new DialogClientView(widget, GetContentsView());
+}
 
-  return new DialogClientView(widget, GetContentsView(), params);
+NonClientFrameView* DialogDelegate::CreateNonClientFrameView(Widget* widget) {
+  return UseNewStyle() ? new DialogFrameView() :
+      WidgetDelegate::CreateNonClientFrameView(widget);
 }
 
 const DialogClientView* DialogDelegate::GetDialogClientView() const {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
 DialogClientView* DialogDelegate::GetDialogClientView() {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
@@ skipping 11 matching lines @@
 }
 
 Widget* DialogDelegateView::GetWidget() {
   return View::GetWidget();
 }
 
 const Widget* DialogDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
+View* DialogDelegateView::GetContentsView() {
+  return this;
+}
+
 }  // namespace views