Implement Non-Closable Notification

ui/message_center/views/notification_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 "ui/message_center/views/notification_view.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 41 matching lines @@
 
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
 
 namespace {
 
 // Dimensions.
 const int kProgressBarBottomPadding = 0;
 
+const int kCloseIconTopPadding = 5;
+const int kCloseIconRightPadding = 5;
+
 // static
 scoped_ptr<views::Border> MakeEmptyBorder(int top,
                                           int left,
                                           int bottom,
                                           int right) {
   return views::Border::CreateEmptyBorder(top, left, bottom, right);
 }
 
 // static
 scoped_ptr<views::Border> MakeTextBorder(int padding, int top, int bottom) {
@@ skipping 149 matching lines @@
   // targeting. Using the center point of |rect| preserves this function's
   // expected behavior for the time being.
   gfx::Point point = rect.CenterPoint();
 
   // Want to return this for underlying views, otherwise GetCursor is not
   // called. But buttons are exceptions, they'll have their own event handlings.
   std::vector<views::View*> buttons(action_buttons_.begin(),
                                     action_buttons_.end());
   if (settings_button_view_)
     buttons.push_back(settings_button_view_);
-  buttons.push_back(close_button());
+  if (close_button_)
+    buttons.push_back(close_button_.get());
 
   for (size_t i = 0; i < buttons.size(); ++i) {
     gfx::Point point_in_child = point;
     ConvertPointToTarget(this, buttons[i], &point_in_child);
     if (buttons[i]->HitTestPoint(point_in_child))
       return buttons[i]->GetEventHandlerForPoint(point_in_child);
   }
 
   return root;
 }
 
 void NotificationView::CreateOrUpdateViews(const Notification& notification) {
+  CreateOrUpdateCloseButtonView(notification);
   CreateOrUpdateTitleView(notification);
   CreateOrUpdateMessageView(notification);
   CreateOrUpdateProgressBarView(notification);
   CreateOrUpdateListItemViews(notification);
   CreateOrUpdateIconView(notification);
   CreateOrUpdateImageView(notification);
   CreateOrUpdateContextMessageView(notification);
   CreateOrUpdateSettingsButtonView(notification);
   CreateOrUpdateActionButtonViews(notification);
 }
@@ skipping 47 matching lines @@
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(bottom_view_);
 
   CreateOrUpdateViews(notification);
 
   // Put together the different content and control views. Layering those allows
   // for proper layout logic and it also allows the close button and small
   // image to overlap the content as needed to provide large enough click and
   // touch areas (<http://crbug.com/168822> and <http://crbug.com/168856>).
   AddChildView(small_image());
-  AddChildView(close_button());
   SetAccessibleName(notification);
 
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 NotificationView::~NotificationView() {
 }
 
 gfx::Size NotificationView::GetPreferredSize() const {
@@ skipping 49 matching lines @@
     title_lines =
         title_view_->GetLinesForWidthAndLimit(width(), kMaxTitleLines);
   }
   if (message_view_)
     message_view_->SetLineLimit(GetMessageLineLimit(title_lines, width()));
 
   // Top views.
   int top_height = top_view_->GetHeightForWidth(content_width);
   top_view_->SetBounds(insets.left(), insets.top(), content_width, top_height);
 
+  // Close button.
+  if (close_button_) {
+    gfx::Rect content_bounds = GetContentsBounds();
+    gfx::Size close_size(close_button_->GetPreferredSize());
+    gfx::Rect close_rect(content_bounds.right() - close_size.width(),
+                         content_bounds.y(), close_size.width(),
+                         close_size.height());
+    close_button_->SetBoundsRect(close_rect);
+  }
+
   // Icon.
   icon_view_->SetBounds(insets.left(), insets.top(), kIconSize, kIconSize);
 
   // Settings & Bottom views.
   int bottom_y = insets.top() + std::max(top_height, kIconSize);
   int bottom_height = bottom_view_->GetHeightForWidth(content_width);
 
   if (settings_button_view_) {
     gfx::Size settings_size(settings_button_view_->GetPreferredSize());
     settings_button_view_->SetBounds(content_width - settings_size.width(),
@@ skipping 47 matching lines @@
   }
 
   // See if the button pressed was an action button.
   for (size_t i = 0; i < action_buttons_.size(); ++i) {
     if (sender == action_buttons_[i]) {
       controller_->ClickOnNotificationButton(id, i);
       return;
     }
   }
 
+  if (close_button_ && sender == close_button_.get()) {
+    controller_->RemoveNotification(notification_id(), true);  // By user.

[dewittj, 2016/02/10 00:03:15]

nit: should be consistent in comments, so this should be true /* by user */

+  }
+
   // Let the superclass handle everything else.
   // Warning: This may cause the NotificationView itself to be deleted,
   // so don't do anything afterwards.
   MessageView::ButtonPressed(sender, event);
 }
 
 void NotificationView::ClickOnNotification(const std::string& notification_id) {
   controller_->ClickOnNotification(notification_id);
 }
 
@@ skipping 307 matching lines @@
   if (new_buttons) {
     Layout();
     views::Widget* widget = GetWidget();
     if (widget != NULL) {
       widget->SetSize(widget->GetContentsView()->GetPreferredSize());
       GetWidget()->SynthesizeMouseMoveEvent();
     }
   }
 }
 
+void NotificationView::CreateOrUpdateCloseButtonView(
+    const Notification& notification) {
+  set_slide_out_enabled(!notification.pinned());
+
+  if (!notification.pinned() && !close_button_) {
+    PaddedButton* close = new PaddedButton(this);
+    close->SetPadding(-kCloseIconRightPadding, kCloseIconTopPadding);
+    close->SetNormalImage(IDR_NOTIFICATION_CLOSE);
+    close->SetHoveredImage(IDR_NOTIFICATION_CLOSE_HOVER);
+    close->SetPressedImage(IDR_NOTIFICATION_CLOSE_PRESSED);
+    close->set_animate_on_state_change(false);
+    close->SetAccessibleName(l10n_util::GetStringUTF16(
+        IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_ACCESSIBLE_NAME));
+    // The close button should be added to view hierarchy by the derived class.
+    // This ensures that it is on top of other views.
+    close->set_owned_by_client();
+    close_button_.reset(close);
+    AddChildView(close_button_.get());
+  } else if (notification.pinned() && close_button_) {
+    close_button_.reset();
+  }
+}
+
 int NotificationView::GetMessageLineLimit(int title_lines, int width) const {
   // Image notifications require that the image must be kept flush against
   // their icons, but we can allow more text if no image.
   int effective_title_lines = std::max(0, title_lines - 1);
   int line_reduction_from_title = (image_view_ ? 1 : 2) * effective_title_lines;
   if (!image_view_) {
     // Title lines are counted as twice as big as message lines for the purpose
     // of this calculation.
     // The effect from the title reduction here should be:
     //   * 0 title lines: 5 max lines message.
@@ skipping 21 matching lines @@
       std::max(0, message_line_limit - line_reduction_from_title);
 
   return message_line_limit;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) const {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
+bool NotificationView::IsCloseButtonFocused() {
+  if (!close_button_)
+    return false;
+
+  views::FocusManager* focus_manager = GetFocusManager();
+  return focus_manager &&
+         focus_manager->GetFocusedView() == close_button_.get();
+}
+
+void NotificationView::RequestFocusOnCloseButton() {
+  if (close_button_)
+    close_button_->RequestFocus();
+}
+
+bool NotificationView::IsPinned() {
+  return !close_button_;
+}
+
 }  // namespace message_center