Change the "close Chrome with downloads in progress" dialog to resemble kenmoore's mock

chrome/browser/ui/views/download/download_in_progress_dialog_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[benrg, 2012/04/17 01:32:44]

I'm still pretty clueless about Chrome memory management. Please check that
there are no leaks or double-frees in this code.

[James Cook, 2012/04/17 19:03:21]

I think this is OK.  The semantics of memory cleanup when windows are being
closed is tricky, but it looks like other people are using DeleteDelegate() the
way you have and I think it's correct.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"
 
 #include <algorithm>
 
 #include "base/string_number_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 #include "ui/views/border.h"
-#include "ui/views/controls/label.h"
+#include "ui/views/controls/message_box_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 // static
 void DownloadInProgressDialogView::Show(Browser* browser,
                                         gfx::NativeWindow parent_window) {
   DownloadInProgressDialogView* window =
       new DownloadInProgressDialogView(browser);
   views::Widget::CreateWindowWithParent(window, parent_window)->Show();
 }
 
 DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser)
     : browser_(browser),
-      warning_(NULL),
-      explanation_(NULL) {
+      message_box_view_(NULL) {
   int download_count;
   Browser::DownloadClosePreventionType type =
       browser_->OkToCloseWithInProgressDownloads(&download_count);
 
   // This dialog should have been created within the same thread invocation
   // as the original test that lead to us, so it should always not be ok
   // to close.
   DCHECK_NE(Browser::DOWNLOAD_CLOSE_OK, type);
 
-  // TODO(rdsmith): This dialog should be different depending on whether we're
-  // closing the last incognito window of a profile or doing browser shutdown.
-  // See http://crbug.com/88421.
+  string16 explanation_text;
+  if (type == Browser::DOWNLOAD_CLOSE_BROWSER_SHUTDOWN) {

[James Cook, 2012/04/17 19:03:21]

Maybe a switch statement on the type with a NOTREACHED() for the
DOWNLOAD_CLOSE_OK case might be a little clearer?

[benrg, 2012/04/17 20:39:14]

Done.

+    if (download_count == 1) {
+      title_text_ = l10n_util::GetStringUTF16(
+          IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_TITLE);
+      explanation_text = l10n_util::GetStringUTF16(
+          IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
+    } else {
+      title_text_ = l10n_util::GetStringUTF16(
+          IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_TITLE);
+      explanation_text = l10n_util::GetStringUTF16(
+          IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
+    }
+    ok_button_text_ = l10n_util::GetStringUTF16(
+        IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
+  } else {  // DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE
+    if (download_count == 1) {
+      title_text_ = l10n_util::GetStringUTF16(
+          IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_TITLE);
+      explanation_text = l10n_util::GetStringUTF16(
+          IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
+    } else {
+      title_text_ = l10n_util::GetStringUTF16(
+          IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_TITLE);
+      explanation_text = l10n_util::GetStringUTF16(
+          IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
+    }
+    ok_button_text_ = l10n_util::GetStringUTF16(
+        IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
+  }
+  cancel_button_text_ = l10n_util::GetStringUTF16(
+      IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
 
-  string16 warning_text;
-  string16 explanation_text;
-  if (download_count == 1) {
-    warning_text = l10n_util::GetStringUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING);
-    explanation_text = l10n_util::GetStringUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
-    ok_button_text_ = l10n_util::GetStringUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
-    cancel_button_text_ = l10n_util::GetStringUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
-  } else {
-    warning_text = l10n_util::GetStringFUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING,
-        base::IntToString16(download_count));
-    explanation_text = l10n_util::GetStringUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
-    ok_button_text_ = l10n_util::GetStringUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL);
-    cancel_button_text_ = l10n_util::GetStringUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
-  }
-
-  // There are two lines of text: the bold warning label and the text
-  // explanation label.
-  views::GridLayout* layout = new views::GridLayout(this);
-  SetLayoutManager(layout);
-  const int columnset_id = 0;
-  views::ColumnSet* column_set = layout->AddColumnSet(columnset_id);
-  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING, 1,
-                        views::GridLayout::USE_PREF, 0, 0);
-
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::Font bold_font = rb.GetFont(
-      ui::ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
-  warning_ = new views::Label(warning_text, bold_font);
-  warning_->SetMultiLine(true);
-  warning_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  warning_->set_border(views::Border::CreateEmptyBorder(10, 10, 10, 10));
-  layout->StartRow(0, columnset_id);
-  layout->AddView(warning_);
-
-  explanation_ = new views::Label(explanation_text);
-  explanation_->SetMultiLine(true);
-  explanation_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  explanation_->set_border(views::Border::CreateEmptyBorder(10, 10, 10, 10));
-  layout->StartRow(0, columnset_id);
-  layout->AddView(explanation_);
-
-  dialog_dimensions_ = views::Widget::GetLocalizedContentsSize(
-      IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS,
-      IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES);
-  const int height =
-      warning_->GetHeightForWidth(dialog_dimensions_.width()) +
-      explanation_->GetHeightForWidth(dialog_dimensions_.width());
-  dialog_dimensions_.set_height(std::max(height,
-                                         dialog_dimensions_.height()));
+  message_box_view_ = new views::MessageBoxView(
+      views::MessageBoxView::NO_OPTIONS, explanation_text, string16());
 }
 
 DownloadInProgressDialogView::~DownloadInProgressDialogView() {}
 
-gfx::Size DownloadInProgressDialogView::GetPreferredSize() {
-  return dialog_dimensions_;
+int DownloadInProgressDialogView::GetDefaultDialogButton() const {
+  return ui::DIALOG_BUTTON_CANCEL;
 }
 
 string16 DownloadInProgressDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return (button == ui::DIALOG_BUTTON_OK) ?
       ok_button_text_ : cancel_button_text_;
 }
 
-int DownloadInProgressDialogView::GetDefaultDialogButton() const {
-  return ui::DIALOG_BUTTON_CANCEL;
-}
-
 bool DownloadInProgressDialogView::Cancel() {
   browser_->InProgressDownloadResponse(false);
   return true;
 }
 
 bool DownloadInProgressDialogView::Accept() {
   browser_->InProgressDownloadResponse(true);
   return true;
 }
 
 ui::ModalType DownloadInProgressDialogView::GetModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 string16 DownloadInProgressDialogView::GetWindowTitle() const {
-  return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
+  return title_text_;
+}
+
+void DownloadInProgressDialogView::DeleteDelegate() {
+  delete this;
+}
+
+views::Widget* DownloadInProgressDialogView::GetWidget() {
+  return message_box_view_->GetWidget();
+}
+
+const views::Widget* DownloadInProgressDialogView::GetWidget() const {
+  return message_box_view_->GetWidget();
 }
 
 views::View* DownloadInProgressDialogView::GetContentsView() {
-  return this;
+  return message_box_view_;
 }