Port NotificationViewMD unit tests from NotificationViewTest.

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 "ui/base/cursor/cursor.h"
@@ skipping 98 matching lines @@
 
 // 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;
 
+  const char* GetClassName() const override;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ItemView);
 };
 
 ItemView::ItemView(const message_center::NotificationItem& item) {
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, gfx::Insets(), 0));
 
   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(l10n_util::GetStringFUTF16(
       IDS_MESSAGE_CENTER_LIST_NOTIFICATION_MESSAGE_WITH_DIVIDER, 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() = default;
 
+const char* ItemView::GetClassName() const {
+  return "ItemView";
+}
+
 // CompactTitleMessageView /////////////////////////////////////////////////////
 
 // CompactTitleMessageView shows notification title and message in a single
 // line. This view is used for NOTIFICATION_TYPE_PROGRESS.
 class CompactTitleMessageView : public views::View {
  public:
   explicit CompactTitleMessageView();
   ~CompactTitleMessageView() override;
 
+  const char* GetClassName() const override;
+
   void OnPaint(gfx::Canvas* canvas) override;
 
   void set_title(const base::string16& title) { title_ = title; }
   void set_message(const base::string16& message) { message_ = message; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CompactTitleMessageView);
 
   base::string16 title_;
   base::string16 message_;
 
   views::Label* title_view_ = nullptr;
   views::Label* message_view_ = nullptr;
 };
 
-CompactTitleMessageView::~CompactTitleMessageView() {}
+CompactTitleMessageView::~CompactTitleMessageView() = default;
+
+const char* CompactTitleMessageView::GetClassName() const {
+  return "CompactTitleMessageView";
+}
 
 CompactTitleMessageView::CompactTitleMessageView() {
   SetLayoutManager(new views::FillLayout());
 
   const gfx::FontList& font_list = views::Label().font_list().Derive(
       1, gfx::Font::NORMAL, gfx::Font::Weight::NORMAL);
 
   title_view_ = new views::Label();
   title_view_->SetFontList(font_list);
   title_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ skipping 40 matching lines @@
 // NotificationButtonMD ////////////////////////////////////////////////////////
 
 // This class is needed in addition to LabelButton mainly becuase we want to set
 // visible_opacity of InkDropHighlight.
 class NotificationButtonMD : public views::LabelButton {
  public:
   NotificationButtonMD(views::ButtonListener* listener,
                        const base::string16& text);
   ~NotificationButtonMD() override;
 
+  const char* GetClassName() const override;
+
   std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
       const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NotificationButtonMD);
 };
 
 NotificationButtonMD::NotificationButtonMD(views::ButtonListener* listener,
                                            const base::string16& text)
     : views::LabelButton(listener, text, views::style::CONTEXT_BUTTON_MD) {
   SetInkDropMode(views::LabelButton::InkDropMode::ON);
   set_has_ink_drop_action_on_click(true);
   set_ink_drop_base_color(kActionButtonInkDropBaseColor);
   set_ink_drop_visible_opacity(kActionButtonInkDropRippleVisibleOpacity);
   SetEnabledTextColors(kActionButtonTextColor);
   SetBorder(views::CreateEmptyBorder(kActionButtonPadding));
   SetMinSize(kActionButtonMinSize);
   SetFocusForPlatform();
 }
 
 NotificationButtonMD::~NotificationButtonMD() = default;
 
+const char* NotificationButtonMD::GetClassName() const {
+  return "NotificationButtonMD";
+}
+
 std::unique_ptr<views::InkDropHighlight>
 NotificationButtonMD::CreateInkDropHighlight() const {
   std::unique_ptr<views::InkDropHighlight> highlight =
       views::LabelButton::CreateInkDropHighlight();
   highlight->set_visible_opacity(kActionButtonInkDropHighlightVisibleOpacity);
   return highlight;
 }
 
 }  // anonymous namespace
 
@@ skipping 35 matching lines @@
 void NotificationViewMD::CreateOrUpdateViews(const Notification& notification) {
   CreateOrUpdateContextTitleView(notification);
   CreateOrUpdateTitleView(notification);
   CreateOrUpdateMessageView(notification);
   CreateOrUpdateCompactTitleMessageView(notification);
   CreateOrUpdateProgressBarView(notification);
   CreateOrUpdateListItemViews(notification);
   CreateOrUpdateIconView(notification);
   CreateOrUpdateSmallIconView(notification);
   CreateOrUpdateImageView(notification);
-  CreateOrUpdateActionButtonViews(notification);
   CreateOrUpdateCloseButtonView(notification);
   CreateOrUpdateSettingsButtonView(notification);
   UpdateViewForExpandedState(expanded_);
+  // Should be called at the last because SynthesizeMouseMoveEvent() requires
+  // everything is in the right location when called.
+  CreateOrUpdateActionButtonViews(notification);
 }
 
 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 144 matching lines @@
 }
 
 void NotificationViewMD::CreateOrUpdateContextTitleView(
     const Notification& notification) {
   header_row_->SetAppName(notification.display_source());
   header_row_->SetTimestamp(notification.timestamp());
 }
 
 void NotificationViewMD::CreateOrUpdateTitleView(
     const Notification& notification) {
-  if (notification.type() == NOTIFICATION_TYPE_PROGRESS) {
-    left_content_->RemoveChildView(title_view_);
+  if (notification.title().empty() ||
+      notification.type() == NOTIFICATION_TYPE_PROGRESS) {
+    if (title_view_ != nullptr)

[fukino, 2017/07/06 12:44:10]

nit: "if (title_view_)" is sufficient and consistent with the rest.

[tetsui, 2017/07/07 01:52:41]

Done.

+      left_content_->RemoveChildView(title_view_);
     title_view_ = nullptr;
     return;
   }
   const gfx::FontList& font_list = views::Label().font_list().Derive(
       1, gfx::Font::NORMAL, gfx::Font::Weight::NORMAL);
 
   int title_character_limit =
       kNotificationWidth * kMaxTitleLines / kMinPixelsPerTitleCharacter;
 
   base::string16 title = gfx::TruncateString(
@@ skipping 34 matching lines @@
   } else {
     message_view_->SetText(text);
   }
 
   message_view_->SetVisible(notification.items().empty());
 }
 
 void NotificationViewMD::CreateOrUpdateCompactTitleMessageView(
     const Notification& notification) {
   if (notification.type() != NOTIFICATION_TYPE_PROGRESS) {
-    left_content_->RemoveChildView(compact_title_message_view_);
+    if (compact_title_message_view_ != nullptr)

[fukino, 2017/07/06 12:44:11]

ditto

[tetsui, 2017/07/07 01:52:41]

Done.

+      left_content_->RemoveChildView(compact_title_message_view_);
     compact_title_message_view_ = nullptr;
     return;
   }
   if (!compact_title_message_view_) {
     compact_title_message_view_ = new CompactTitleMessageView();
     left_content_->AddChildView(compact_title_message_view_);
   }
 
   compact_title_message_view_->set_title(notification.title());
   compact_title_message_view_->set_message(notification.message());
   left_content_->InvalidateLayout();
 }
 
 void NotificationViewMD::CreateOrUpdateProgressBarView(
     const Notification& notification) {
   if (notification.type() != NOTIFICATION_TYPE_PROGRESS) {
-    left_content_->RemoveChildView(progress_bar_view_);
+    if (progress_bar_view_ != nullptr)

[fukino, 2017/07/06 12:44:10]

ditto

[tetsui, 2017/07/07 01:52:41]

Done.

+      left_content_->RemoveChildView(progress_bar_view_);
     progress_bar_view_ = nullptr;
     header_row_->ClearProgress();
     return;
   }
 
   DCHECK(left_content_);
 
   if (!progress_bar_view_) {
     progress_bar_view_ = new views::ProgressBar(kProgressBarHeight,
                                                 /* allow_round_corner */ false);
@@ skipping 27 matching lines @@
 
   // Needed when CreateOrUpdateViews is called for update.
   if (!item_views_.empty())
     left_content_->InvalidateLayout();
 }
 
 void NotificationViewMD::CreateOrUpdateIconView(
     const Notification& notification) {
   if (notification.type() == NOTIFICATION_TYPE_PROGRESS ||
       notification.type() == NOTIFICATION_TYPE_MULTIPLE) {
-    right_content_->RemoveChildView(icon_view_);
+    if (icon_view_ != nullptr)

[fukino, 2017/07/06 12:44:11]

ditto

[tetsui, 2017/07/07 01:52:41]

Done.

+      right_content_->RemoveChildView(icon_view_);
     icon_view_ = nullptr;
     return;
   }
 
   gfx::Size image_view_size(30, 30);
   if (!icon_view_) {
     icon_view_ = new ProportionalImageView(image_view_size);
     right_content_->AddChildView(icon_view_);
   }
 
@@ skipping 71 matching lines @@
           new NotificationButtonMD(this, button_info.title);
       action_buttons_.push_back(button);
       actions_row_->AddChildView(button);
     } else {
       action_buttons_[i]->SetText(button_info.title);
       action_buttons_[i]->SchedulePaint();
       action_buttons_[i]->Layout();
     }
   }
 
-  if (new_buttons) {
-    // TODO(fukino): Investigate if this Layout() is necessary.
-    Layout();
+  // Inherit mouse hover state when action button views reset.
+  // If the view is not expanded, there should be no hover state.
+  if (new_buttons && expanded_) {
     views::Widget* widget = GetWidget();
-    if (widget != NULL) {
+    if (widget != nullptr) {

[fukino, 2017/07/06 12:44:11]

ditto

[tetsui, 2017/07/07 01:52:41]

Done.

+      // This Layout() is needed because button should be in the right location
+      // in the view hierarchy when SynthesizeMouseMoveEvent() is called.
+      Layout();
       widget->SetSize(widget->GetContentsView()->GetPreferredSize());
       GetWidget()->SynthesizeMouseMoveEvent();
     }
   }
 }
 
 void NotificationViewMD::CreateOrUpdateCloseButtonView(
     const Notification& notification) {
   if (!notification.pinned()) {
     header_row_->SetCloseButtonEnabled(true);
@@ skipping 65 matching lines @@
                                   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