Add dialog-specific styling, restore old-style task manager.

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/logging.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches_util.h"
@@ skipping 21 matching lines @@
   return switches::IsNewDialogStyleEnabled();
 }
 
 // static
 Widget* DialogDelegate::CreateDialogWidget(DialogDelegate* dialog,
                                            gfx::NativeWindow context,
                                            gfx::NativeWindow parent) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.delegate = dialog;
-  if (DialogDelegate::UseNewStyle()) {
+  const bool use_new_style = dialog ?
+      dialog->UseNewStyleForThisDialog() : DialogDelegate::UseNewStyle();
+  if (use_new_style) {
     // Note: Transparent widgets cannot host native Windows textfield controls.
     params.transparent = true;
     params.remove_standard_frame = true;
   }
   params.context = context;
   params.parent = parent;
   params.top_level = true;
   widget->Init(params);
-  if (DialogDelegate::UseNewStyle()) {
+  if (use_new_style) {
 #if defined(USE_AURA)
     // TODO(msw): Add a matching shadow type and remove the bubble frame border?
     corewm::SetShadowType(widget->GetNativeWindow(), corewm::SHADOW_TYPE_NONE);
 #endif
   }
   return widget;
 }
 
 View* DialogDelegate::CreateExtraView() {
   return NULL;
@@ skipping 86 matching lines @@
 
 DialogDelegate* DialogDelegate::AsDialogDelegate() {
   return this;
 }
 
 ClientView* DialogDelegate::CreateClientView(Widget* widget) {
   return new DialogClientView(widget, GetContentsView());
 }
 
 NonClientFrameView* DialogDelegate::CreateNonClientFrameView(Widget* widget) {
-  return UseNewStyle() ? CreateNewStyleFrameView(widget) :
-                         WidgetDelegate::CreateNonClientFrameView(widget);
+  if (UseNewStyleForThisDialog())
+    return CreateNewStyleFrameView(widget);
+  return WidgetDelegate::CreateNonClientFrameView(widget);
 }
 
 // static
 NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
   return CreateNewStyleFrameView(widget, false);
 }
 
 NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(
     Widget* widget,
     bool force_opaque_border) {
@@ skipping 16 matching lines @@
     View* titlebar_view = delegate->CreateTitlebarExtraView();
     if (titlebar_view)
       frame->SetTitlebarExtraView(titlebar_view);
   }
   frame->SetShowCloseButton(widget->widget_delegate()->ShouldShowCloseButton());
   if (force_opaque_border)
     widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
   return frame;
 }
 
+bool DialogDelegate::UseNewStyleForThisDialog() const {
+  return UseNewStyle();
+}
+
 const DialogClientView* DialogDelegate::GetDialogClientView() const {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
 DialogClientView* DialogDelegate::GetDialogClientView() {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
 ui::AccessibilityTypes::Role DialogDelegate::GetAccessibleWindowRole() const {
   return ui::AccessibilityTypes::ROLE_DIALOG;
@@ skipping 19 matching lines @@
 
 const Widget* DialogDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 View* DialogDelegateView::GetContentsView() {
   return this;
 }
 
 }  // namespace views