Add support for multi-line GlobalError messages to Views.

chrome/browser/ui/views/global_error_bubble_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 "chrome/browser/ui/views/global_error_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
@@ skipping 62 matching lines @@
   int resource_id = error_->GetBubbleViewIconResourceID();
   scoped_ptr<views::ImageView> image_view(new views::ImageView());
   image_view->SetImage(rb.GetImageNamed(resource_id).ToImageSkia());
 
   string16 title_string(error_->GetBubbleViewTitle());
   scoped_ptr<views::Label> title_label(new views::Label(title_string));
   title_label->SetMultiLine(true);
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_label->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
 
-  string16 message_string(error_->GetBubbleViewMessage());
-  views::Label* message_label = new views::Label(message_string);
-  message_label->SetMultiLine(true);
-  message_label->SizeToFit(kMaxBubbleViewWidth);
-  message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  std::vector<string16> message_strings(error_->GetBubbleViewMessages());
+  if (message_strings.empty())
+    message_strings.push_back(error_->GetBubbleViewMessage());
+  std::vector<views::Label*> message_labels;
+  for (size_t i = 0; i < message_strings.size(); ++i) {
+    views::Label* message_label = new views::Label(message_strings[i]);
+    message_label->SetMultiLine(true);
+    message_label->SizeToFit(kMaxBubbleViewWidth);
+    message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    message_labels.push_back(message_label);
+  }
 
   string16 accept_string(error_->GetBubbleViewAcceptButtonLabel());
   scoped_ptr<views::LabelButton> accept_button(
       new views::LabelButton(this, accept_string));
   accept_button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   accept_button->SetIsDefault(true);
   accept_button->set_tag(TAG_ACCEPT_BUTTON);
 
   string16 cancel_string(error_->GetBubbleViewCancelButtonLabel());
   scoped_ptr<views::LabelButton> cancel_button;
   if (!cancel_string.empty()) {
     cancel_button.reset(new views::LabelButton(this, cancel_string));
     cancel_button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
     cancel_button->set_tag(TAG_CANCEL_BUTTON);
   }
 
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   layout->SetInsets(0, 0, kLayoutBottomPadding, 0);
 
   // Top row, icon and title.
   views::ColumnSet* cs = layout->AddColumnSet(0);
   cs->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING,
                 0, views::GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(0, kTitleHorizontalPadding);
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                 1, views::GridLayout::USE_PREF, 0, 0);
 
-  // Middle row, message label.
+  // Middle rows, message labels.
   cs = layout->AddColumnSet(1);
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                 1, views::GridLayout::USE_PREF, 0, 0);
 
   // Bottom row, accept and cancel button.
   cs = layout->AddColumnSet(2);
   cs->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing);
   cs->AddColumn(views::GridLayout::TRAILING, views::GridLayout::LEADING,
                 0, views::GridLayout::USE_PREF, 0, 0);
   if (cancel_button.get()) {
     cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
     cs->AddColumn(views::GridLayout::TRAILING, views::GridLayout::LEADING,
                   0, views::GridLayout::USE_PREF, 0, 0);
   }
 
   layout->StartRow(1, 0);
   layout->AddView(image_view.release());
   layout->AddView(title_label.release());
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 
-  layout->StartRow(1, 1);
-  layout->AddView(message_label);
+  for (size_t i = 0; i < message_labels.size(); ++i) {
+    layout->StartRow(1, 1);
+    layout->AddView(message_labels[i]);
+    if (i < message_labels.size() - 1)
+      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  }
   layout->AddPaddingRow(0, views::kLabelToControlVerticalSpacing);
 
   layout->StartRow(0, 2);
   layout->AddView(accept_button.release());
   if (cancel_button.get())
     layout->AddView(cancel_button.release());
 
   // Adjust the message label size in case buttons are too long.
-  message_label->SizeToFit(layout->GetPreferredSize(this).width());
+  for (size_t i = 0; i < message_labels.size(); ++i)
+    message_labels[i]->SizeToFit(layout->GetPreferredSize(this).width());
 }
 
 GlobalErrorBubbleView::~GlobalErrorBubbleView() {
 }
 
 void GlobalErrorBubbleView::ButtonPressed(views::Button* sender,
                                           const ui::Event& event) {
   if (error_) {
     if (sender->tag() == TAG_ACCEPT_BUTTON)
       error_->BubbleViewAcceptButtonPressed(browser_);
     else if (sender->tag() == TAG_CANCEL_BUTTON)
       error_->BubbleViewCancelButtonPressed(browser_);
     else
       NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 void GlobalErrorBubbleView::WindowClosing() {
   if (error_)
     error_->BubbleViewDidClose(browser_);
 }
 
 void GlobalErrorBubbleView::CloseBubbleView() {
   GetWidget()->Close();
 }