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;
+
+// A simple view that prepends a view with a bullet with the help of a grid
+// layout.
+class BulletedView : public views::View {
+ public:
+  explicit BulletedView(views::View* view);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BulletedView);
+};
+
+BulletedView::BulletedView(views::View* view) {
+  views::GridLayout* layout = new views::GridLayout(this);
+  SetLayoutManager(layout);
+  views::ColumnSet* column_set = layout->AddColumnSet(0);

[sky, 2017/05/18 16:10:06]

Creating another view will certainly work, but GridLayout was designed to
support multiple column sets. In other words you shouldn't need to create a view
subclass here. Instead add a new columnset to the GridLayout created on line 87
with the config you have here.

[Will Harris, 2017/05/18 17:13:29]

Adding a new column set here means that I need to recreate all the padding to
get the rows to align with the previous rows

| padding | text          | padding |
| padding | bul | text    | padding |

I tried this, so far I'm at http://i.imgur.com/rMuDEdZ.png but it looks like I
might need a load of duplication of column layout code of above, I do think the
nested view is better here...

WDYT?

+  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);
+  layout->StartRow(0, 0);
+  views::Label* bullet_label = new views::Label(L"\u2022");
+  bullet_label->SetEnabled(false);
+  bullet_label->SetLineHeight(views::kPanelSubVerticalSpacing);
+  bullet_label->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
+
+  layout->AddView(bullet_label);
+  layout->AddView(view);
+}
+
+views::Label* CreateFormattedLabel(int message_id) {
+  views::Label* label = new views::Label(l10n_util::GetStringUTF16(message_id));
+
+  label->SetMultiLine(true);
+  label->SetEnabled(false);
+  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()));
+  views::Label* message = CreateFormattedLabel(GetMessage());
+  layout->StartRowWithPadding(0, column_set_id, 0, kTitleBottomSpacing);
+  layout->AddView(message, 2, 1, views::GridLayout::LEADING,
+                  views::GridLayout::LEADING);
+  labels_.push_back(message);
+  size_t bullet_id = 0;
+  int bullet_string_id = GetSubMessage(bullet_id);
 
-  message_->SetMultiLine(true);
-  message_->SetEnabled(false);
-  message_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  message_->SetLineHeight(views::kPanelSubVerticalSpacing);
-
-  layout->StartRowWithPadding(0, column_set_id, 0, kTitleBottomSpacing);
-  layout->AddView(message_, 2, 1, views::GridLayout::LEADING,
-                  views::GridLayout::LEADING);
+  while (bullet_string_id) {
+    message = CreateFormattedLabel(bullet_string_id);
+    layout->StartRowWithPadding(0, column_set_id, 0, kBulletBottomSpacing);
+    layout->AddView(new BulletedView(message), 2, 1, views::GridLayout::LEADING,
+                    views::GridLayout::LEADING);
+    labels_.push_back(message);
+    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);
+  for (views::Label* label : labels_) {
+    label->SizeToFit(max_width);
+  }
   title_->SizeToFit(max_width);
 
   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