Add List notification support to new-style notification.

ui/message_center/views/notification_view_md.cc

 // Copyright 2017 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 "ui/message_center/views/notification_view_md.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"

[fukino, 2017/06/13 05:48:24]

seems unnecessary?

[tetsui, 2017/06/13 05:52:39]

Done.

 #include "ui/base/cursor/cursor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
@@ skipping 63 matching lines @@
   const gfx::ImageSkia masked_small_image =
       gfx::ImageSkiaOperations::CreateMaskedImage(foreground, icon);
   return gfx::ImageSkiaOperations::CreateSuperimposedImage(background,
                                                            masked_small_image);
 }
 
 const gfx::ImageSkia GetProductIcon() {
   return gfx::CreateVectorIcon(kProductIcon, kSmallImageColor);
 }
 
+// ItemView ////////////////////////////////////////////////////////////////////
+
+// ItemViews are responsible for drawing each list notification item's title and
+// message next to each other within a single column.
+class ItemView : public views::View {
+ public:
+  explicit ItemView(const message_center::NotificationItem& item);
+  ~ItemView() override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ItemView);
+};
+
+ItemView::ItemView(const message_center::NotificationItem& item) {
+  SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kHorizontal, gfx::Insets(),
+                           message_center::kItemTitleToMessagePadding));
+
+  views::Label* title = new views::Label(item.title);
+  title->set_collapse_when_hidden(true);
+  title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  title->SetEnabledColor(message_center::kRegularTextColor);
+  title->SetBackgroundColor(message_center::kDimTextBackgroundColor);
+  AddChildView(title);
+
+  views::Label* message = new views::Label(item.message);
+  message->set_collapse_when_hidden(true);
+  message->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  message->SetEnabledColor(message_center::kDimTextColor);
+  message->SetBackgroundColor(message_center::kDimTextBackgroundColor);
+  AddChildView(message);
+}
+
+ItemView::~ItemView() {}
+
 }  // anonymous namespace
 
 // ////////////////////////////////////////////////////////////
 // NotificationViewMD
 // ////////////////////////////////////////////////////////////
 
 views::View* NotificationViewMD::TargetForRect(views::View* root,
                                                const gfx::Rect& rect) {
   CHECK_EQ(root, this);
 
@@ skipping 30 matching lines @@
   CreateOrUpdateMessageView(notification);
   CreateOrUpdateProgressBarView(notification);
   CreateOrUpdateListItemViews(notification);
   CreateOrUpdateIconView(notification);
   CreateOrUpdateSmallIconView(notification);
   CreateOrUpdateImageView(notification);
   CreateOrUpdateActionButtonViews(notification);
   CreateOrUpdateCloseButtonView(notification);
   CreateOrUpdateSettingsButtonView(notification);
   UpdateViewForExpandedState(expanded_);
+
+  // Needed when CreateOrUpdateListItemViews is called for update.
+  left_content_->Layout();
 }
 
 NotificationViewMD::NotificationViewMD(MessageCenterController* controller,
                                        const Notification& notification)
     : MessageView(controller, notification),
       clickable_(notification.clickable()) {
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, gfx::Insets(), 0));
 
   // |header_row_| contains app_icon, app_name, control buttons, etc...
@@ skipping 187 matching lines @@
 
   if (!message_view_) {
     message_view_ = new BoundedLabel(text, font_list);
     message_view_->SetLineLimit(kMaxLinesForMessageView);
     message_view_->SetColors(message_center::kDimTextColor,
                              kContextTextBackgroundColor);
     left_content_->AddChildView(message_view_);
   } else {
     message_view_->SetText(text);
   }
+
+  message_view_->SetVisible(notification.items().empty());
 }
 
 void NotificationViewMD::CreateOrUpdateProgressBarView(
     const Notification& notification) {
   // TODO(yoshiki): Implement this.
 }
 
 void NotificationViewMD::CreateOrUpdateListItemViews(
     const Notification& notification) {
-  // TODO(yoshiki): Implement this.
+  for (auto* item_view : item_views_)
+    delete item_view;
+  item_views_.clear();
+
+  const std::vector<NotificationItem>& items = notification.items();
+
+  for (size_t i = 0; i < items.size() && i < kNotificationMaximumItems; ++i) {
+    ItemView* item_view = new ItemView(items[i]);
+    item_views_.push_back(item_view);
+    left_content_->AddChildView(item_view);
+  }
 }
 
 void NotificationViewMD::CreateOrUpdateIconView(
     const Notification& notification) {
   gfx::Size image_view_size(30, 30);
   if (!icon_view_) {
     icon_view_ = new ProportionalImageView(image_view_size);
     right_content_->AddChildView(icon_view_);
   }
 
@@ skipping 108 matching lines @@
     return true;
   }
   // Expandable if there is at least one inline action.
   if (actions_row_->has_children())
     return true;
 
   // Expandable if the notification has image.
   if (image_view_)
     return true;
 
+  // Expandable if there are multiple list items.
+  if (item_views_.size() > 1)
+    return true;
+
   // TODO(fukino): Expandable if both progress bar and message exist.
 
   return false;
 }
 
 void NotificationViewMD::ToggleExpanded() {
   expanded_ = !expanded_;
   UpdateViewForExpandedState(expanded_);
   content_row_->InvalidateLayout();
   if (controller())
     controller()->UpdateNotificationSize(notification_id());
 }
 
 void NotificationViewMD::UpdateViewForExpandedState(bool expanded) {
   header_row_->SetExpanded(expanded);
   if (message_view_) {
     message_view_->SetLineLimit(expanded ? kMaxLinesForExpandedMessageView
                                          : kMaxLinesForMessageView);
   }
   if (image_container_)
     image_container_->SetVisible(expanded);
   actions_row_->SetVisible(expanded && actions_row_->has_children());
+  for (size_t i = 1; i < item_views_.size(); ++i) {
+    item_views_[i]->SetVisible(expanded);
+  }
 }
 
 void NotificationViewMD::UpdateControlButtonsVisibility() {
   const bool target_visibility = IsMouseHovered() || HasFocus() ||
                                  (header_row_->IsExpandButtonEnabled() &&
                                   header_row_->expand_button()->HasFocus()) ||
                                  (header_row_->IsCloseButtonEnabled() &&
                                   header_row_->close_button()->HasFocus()) ||
                                  (header_row_->IsSettingsButtonEnabled() &&
                                   header_row_->settings_button()->HasFocus());
 
   header_row_->SetControlButtonsVisible(target_visibility);
 }
 
 }  // namespace message_center