New Sad Tab strings.

chrome/browser/ui/views/sad_tab_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/sad_tab_view.h"
 
 #include <string>
 
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
@@ skipping 12 matching lines @@
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 constexpr int kMaxContentWidth = 600;
 constexpr int kMinColumnWidth = 120;
 constexpr int kTitleBottomSpacing = 13;
+constexpr int kBulletBottomSpacing = 1;
+constexpr int kBulletWidth = 20;
+constexpr int kBulletPadding = 13;
+
+views::Label* CreateFormattedLabel(const base::string16& message) {
+  views::Label* label = new views::Label(message);
+
+  label->SetMultiLine(true);
+  label->SetEnabled(false);

[sky, 2017/05/18 20:53:36]

I don't think you need this.

[Will Harris, 2017/05/18 21:02:07]

this is needed to make the text grey rather than black:

http://i.imgur.com/2lK3mrD.png

See https://codereview.chromium.org/2838273002

+  label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  label->SetLineHeight(views::kPanelSubVerticalSpacing);
+
+  return label;
+}
 
 }  // namespace
 
 SadTabView::SadTabView(content::WebContents* web_contents,
                        chrome::SadTabKind kind)
     : SadTab(web_contents, kind) {
   set_background(views::Background::CreateThemedSolidBackground(
       this, ui::NativeTheme::kColorId_DialogBackground));
 
   views::GridLayout* layout = new views::GridLayout(this);
@@ skipping 18 matching lines @@
 
   title_ = new views::Label(l10n_util::GetStringUTF16(GetTitle()));
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   title_->SetFontList(rb.GetFontList(ui::ResourceBundle::LargeFont));
   title_->SetMultiLine(true);
   title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->StartRowWithPadding(0, column_set_id, 0,
                               views::kPanelVerticalSpacing);
   layout->AddView(title_, 2, 1);
 
-  message_ = new views::Label(l10n_util::GetStringUTF16(GetMessage()));
-
-  message_->SetMultiLine(true);
-  message_->SetEnabled(false);
-  message_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  message_->SetLineHeight(views::kPanelSubVerticalSpacing);
-
+  message_ = CreateFormattedLabel(l10n_util::GetStringUTF16(GetMessage()));
   layout->StartRowWithPadding(0, column_set_id, 0, kTitleBottomSpacing);
   layout->AddView(message_, 2, 1, views::GridLayout::LEADING,
                   views::GridLayout::LEADING);
+  size_t bullet_id = 0;
+  int bullet_string_id = GetSubMessage(bullet_id);
+  if (bullet_string_id) {
+    const int bullet_columnset_id = 1;
+    views::ColumnSet* column_set = layout->AddColumnSet(bullet_columnset_id);
+    column_set->AddPaddingColumn(1, views::kPanelSubVerticalSpacing);
+    column_set->AddColumn(views::GridLayout::TRAILING,
+                          views::GridLayout::LEADING, 0,
+                          views::GridLayout::FIXED, kBulletWidth, 0);
+    column_set->AddPaddingColumn(0, kBulletPadding);
+    column_set->AddColumn(views::GridLayout::LEADING,
+                          views::GridLayout::LEADING, 0,
+                          views::GridLayout::USE_PREF,
+                          0,  // No fixed width.
+                          0);
+    column_set->AddPaddingColumn(1, views::kPanelSubVerticalSpacing);
+
+    while (bullet_string_id) {
+      views::Label* bullet_label = CreateFormattedLabel(L"\u2022");
+      views::Label* label =
+          CreateFormattedLabel(l10n_util::GetStringUTF16(bullet_string_id));
+
+      layout->StartRowWithPadding(0, bullet_columnset_id, 0,
+                                  kBulletBottomSpacing);
+      layout->AddView(bullet_label);
+      layout->AddView(label);
+
+      bullet_labels_.push_back(label);
+      bullet_string_id = GetSubMessage(++bullet_id);
+    }
+  }
 
   action_button_ = views::MdTextButton::CreateSecondaryUiBlueButton(
       this, l10n_util::GetStringUTF16(GetButtonTitle()));
   help_link_ = new views::Link(l10n_util::GetStringUTF16(GetHelpLinkTitle()));
   help_link_->set_listener(this);
   layout->StartRowWithPadding(0, column_set_id, 0,
                               views::kPanelVerticalSpacing);
   layout->AddView(help_link_, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::CENTER);
   layout->AddView(action_button_, 1, 1, views::GridLayout::TRAILING,
@@ skipping 33 matching lines @@
 void SadTabView::ButtonPressed(views::Button* sender,
                                const ui::Event& event) {
   DCHECK_EQ(action_button_, sender);
   PerformAction(Action::BUTTON);
 }
 
 void SadTabView::Layout() {
   // Specify the maximum message width explicitly.
   const int max_width =
       std::min(width() - views::kPanelSubVerticalSpacing * 2, kMaxContentWidth);
+
   message_->SizeToFit(max_width);
   title_->SizeToFit(max_width);
 
+  // Bullet labels need to take into acocunt the size of the bullet.
+  for (views::Label* label : bullet_labels_) {

[sky, 2017/05/18 20:53:36]

no {}

[Will Harris, 2017/05/18 21:02:07]

Done.

+    label->SizeToFit(max_width - kBulletWidth - kBulletPadding);
+  }
+
   View::Layout();
 }
 
 void SadTabView::OnPaint(gfx::Canvas* canvas) {
   if (!painted_) {
     RecordFirstPaint();
     painted_ = true;
   }
   View::OnPaint(canvas);
 }
 
 namespace chrome {
 
 SadTab* SadTab::Create(content::WebContents* web_contents,
                        SadTabKind kind) {
   return new SadTabView(web_contents, kind);
 }
 
 }  // namespace chrome