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 13 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 = 3;
 
 }  // namespace
 
 SadTabView::SadTabView(content::WebContents* web_contents,
                        chrome::SadTabKind kind)
     : SadTab(web_contents, kind) {
   // Set the background color.
   set_background(
       views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_DialogBackground)));
@@ skipping 23 matching lines @@
   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);
 
   const SkColor text_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor);
 
-  message_ = CreateLabel(l10n_util::GetStringUTF16(GetMessage()));
+  views::Label* message = CreateLabel(l10n_util::GetStringUTF16(GetMessage()));
 
-  message_->SetMultiLine(true);
-  message_->SetEnabledColor(text_color);
-  message_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  message_->SetLineHeight(views::kPanelSubVerticalSpacing);
+  message->SetMultiLine(true);
+  message->SetEnabledColor(text_color);
+  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,
+  layout->AddView(message, 2, 1, views::GridLayout::LEADING,
                   views::GridLayout::LEADING);
+  messages_.push_back(message);
+  size_t bullet = 0;
+  int bullet_string_id = GetBulletText(bullet);
+
+  while (bullet_string_id) {
+    // TODO(wfh) add bullet here.
+    base::string16 bullet_string = l10n_util::GetStringUTF16(bullet_string_id);
+    bullet_string = L"     \u2022 " + bullet_string;

[Will Harris, 2017/04/03 19:49:19]

I don't know how to do indents here.

[kylix_rd, 2017/04/04 20:59:07]

Did you try setting the indent padding in layout->StartRowWithPadding()?

[Will Harris, 2017/04/05 20:01:06]

which parameter is the indent padding? I saw only options for vertical padding.

[kylix_rd, 2017/04/07 15:47:23]

Ah, ok. I thought there was an option for indenting. Another way to handle this
is to set the insets on the view itself. You may have to create a descendant to
override GetInsets().

+    message = CreateLabel(bullet_string);

[Will Harris, 2017/04/03 19:49:19]

I'm assuming something owns and frees the memory that |message| now points to?

[kylix_rd, 2017/04/04 20:59:07]

The view is "owned" by the SadTabView instance by virtue of also being added to
the layout. The SadTabView instance should control its lifetime.

[Will Harris, 2017/04/05 20:01:06]

"its" refers to the layout?

I think the call to SetLayoutManager handles the ownership here.

[kylix_rd, 2017/04/07 15:47:23]

The layout manager will add the view to the view on which the layout manager is
set. Ultimately, each view "owns" it's child views.

+
+    message->SetMultiLine(true);
+    message->SetEnabledColor(text_color);
+    message->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    message->SetLineHeight(views::kPanelSubVerticalSpacing);
+
+    layout->StartRowWithPadding(0, column_set_id, 0, kBulletBottomSpacing);
+    layout->AddView(message, 2, 1, views::GridLayout::LEADING,
+                    views::GridLayout::LEADING);
+    messages_.push_back(message);
+    bullet++;
+    bullet_string_id = GetBulletText(bullet);
+  }
 
   action_button_ = views::MdTextButton::CreateSecondaryUiBlueButton(
       this, l10n_util::GetStringUTF16(GetButtonTitle()));
   help_link_ =
       CreateLink(l10n_util::GetStringUTF16(GetHelpLinkTitle()), text_color);
   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 (auto* message : messages_) {
+    message->SizeToFit(max_width);
+  }
   title_->SizeToFit(max_width);
 
   View::Layout();
 }
 
 void SadTabView::OnPaint(gfx::Canvas* canvas) {
   if (!painted_) {
     RecordFirstPaint();
     painted_ = true;
   }
@@ skipping 16 matching lines @@
 }
 
 namespace chrome {
 
 SadTab* SadTab::Create(content::WebContents* web_contents,
                        SadTabKind kind) {
   return new SadTabView(web_contents, kind);
 }
 
 }  // namespace chrome