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

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 <algorithm>
 
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 22 matching lines @@
 
 DialogClientView::DialogClientView(Widget* owner, View* contents_view)
     : ClientView(owner, contents_view),
       ok_button_(NULL),
       cancel_button_(NULL),
       default_button_(NULL),
       focus_manager_(NULL),
       extra_view_(NULL),
       footnote_view_(NULL),
       notified_delegate_(false) {
-  // When using the new style, the background color is set on the bubble frame,
-  // so a transparent background is fine.
-  if (!DialogDelegate::UseNewStyle()) {
-    const SkColor color = owner->GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_DialogBackground);
-    set_background(views::Background::CreateSolidBackground(color));
-  }
 }
 
 DialogClientView::~DialogClientView() {
   if (focus_manager_)
     focus_manager_->RemoveFocusChangeListener(this);
   focus_manager_ = NULL;
 }
 
 void DialogClientView::AcceptWindow() {
   // Only notify the delegate once. See |notified_delegate_|'s comment.
@@ skipping 196 matching lines @@
 bool DialogClientView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   DCHECK_EQ(accelerator.key_code(), ui::VKEY_ESCAPE);
   Close();
   return true;
 }
 
 void DialogClientView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   ClientView::ViewHierarchyChanged(details);
   if (details.is_add && details.child == this) {
+    // The old dialog style needs an explicit background color, while the new
+    // dialog style simply inherits the bubble's frame view color.
+    const DialogDelegate* dialog = GetDialogDelegate();
+    const bool use_new_style = dialog ?
+        dialog->UseNewStyleForThisDialog() : DialogDelegate::UseNewStyle();
+    if (!use_new_style)
+      set_background(views::Background::CreateSolidBackground(GetNativeTheme()->
+          GetSystemColor(ui::NativeTheme::kColorId_DialogBackground)));
+
     focus_manager_ = GetFocusManager();
     if (focus_manager_)
       GetFocusManager()->AddFocusChangeListener(this);
 
     UpdateDialogButtons();
     CreateExtraView();
     CreateFootnoteView();
   }
 }
 
@@ skipping 106 matching lines @@
       gfx::Insets(0, kButtonHEdgeMargin,
                   kButtonVEdgeMargin, kButtonHEdgeMargin);
 }
 
 void DialogClientView::Close() {
   GetWidget()->Close();
   GetDialogDelegate()->OnClose();
 }
 
 }  // namespace views