Transfer responsibility for providing a close button for a notification to each implementation of M…

ui/message_center/views/message_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/message_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/message_center_controller.h"
-#include "ui/message_center/views/padded_button.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/painter.h"
 #include "ui/views/shadow_border.h"
 
 namespace {
 
-constexpr int kCloseIconTopPadding = 5;
-constexpr int kCloseIconRightPadding = 5;
-
 constexpr int kShadowOffset = 1;
 constexpr int kShadowBlur = 4;
 
 // Creates a text for spoken feedback from the data contained in the
 // notification.
 base::string16 CreateAccessibleName(
     const message_center::Notification& notification) {
   if (!notification.accessible_name().empty())
     return notification.accessible_name();
 
@@ skipping 42 matching lines @@
 
   accessible_name_ = CreateAccessibleName(notification);
 }
 
 MessageView::~MessageView() {
 }
 
 void MessageView::UpdateWithNotification(const Notification& notification) {
   small_image_view_->SetImage(notification.small_image().AsImageSkia());
   display_source_ = notification.display_source();
-  CreateOrUpdateCloseButtonView(notification);
   accessible_name_ = CreateAccessibleName(notification);
 }
 
 // static
 gfx::Insets MessageView::GetShadowInsets() {
   return gfx::Insets(kShadowBlur / 2 - kShadowOffset,
                      kShadowBlur / 2,
                      kShadowBlur / 2 + kShadowOffset,
                      kShadowBlur / 2);
 }
 
 void MessageView::CreateShadowBorder() {
   SetBorder(std::unique_ptr<views::Border>(new views::ShadowBorder(
       gfx::ShadowValue(gfx::Vector2d(0, kShadowOffset), kShadowBlur,
                        message_center::kShadowColor))));
 }
 
-bool MessageView::IsCloseButtonFocused() {
-  if (!close_button_)
-    return false;
-
-  views::FocusManager* focus_manager = GetFocusManager();
-  return focus_manager &&
-         focus_manager->GetFocusedView() == close_button_.get();
-}
-
-void MessageView::RequestFocusOnCloseButton() {
-  if (close_button_)
-    close_button_->RequestFocus();
-}
-
-bool MessageView::IsPinned() {
-  return !close_button_;
-}
-
 void MessageView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_BUTTON;
   node_data->SetName(accessible_name_);
 }
 
 bool MessageView::OnMousePressed(const ui::MouseEvent& event) {
   if (!event.IsOnlyLeftMouseButton())
     return false;
 
   controller_->ClickOnNotification(notification_id_);
@@ skipping 21 matching lines @@
   // ui/views/controls/buttons/custom_button.cc for why.
   if (event.flags() != ui::EF_NONE || event.key_code() != ui::VKEY_SPACE)
     return false;
 
   controller_->ClickOnNotification(notification_id_);
   return true;
 }
 
 void MessageView::OnPaint(gfx::Canvas* canvas) {
   DCHECK_EQ(this, small_image_view_->parent());
-  DCHECK_EQ(this, close_button_->parent());
   SlideOutView::OnPaint(canvas);
   views::Painter::PaintFocusPainter(this, canvas, focus_painter_.get());
 }
 
 void MessageView::OnFocus() {
   SlideOutView::OnFocus();
   // We paint a focus indicator.
   SchedulePaint();
 }
 
 void MessageView::OnBlur() {
   SlideOutView::OnBlur();
   // We paint a focus indicator.
   SchedulePaint();
 }
 
 void MessageView::Layout() {
   gfx::Rect content_bounds = GetContentsBounds();
 
   // Background.
   background_view_->SetBoundsRect(content_bounds);
 
-  // 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);
-  }
-
   gfx::Size small_image_size(small_image_view_->GetPreferredSize());
   gfx::Rect small_image_rect(small_image_size);
   small_image_rect.set_origin(gfx::Point(
       content_bounds.right() - small_image_size.width() - kSmallImagePadding,
       content_bounds.bottom() - small_image_size.height() -
           kSmallImagePadding));
   small_image_view_->SetBoundsRect(small_image_rect);
 }
 
 void MessageView::OnGestureEvent(ui::GestureEvent* event) {
@@ skipping 24 matching lines @@
   // slide-out behavior. See http://crbug.com/172991
 
   if (!event->IsScrollGestureEvent() && !event->IsFlingScrollEvent())
     return;
 
   if (scroller_)
     scroller_->OnGestureEvent(event);
   event->SetHandled();
 }
 
-void MessageView::ButtonPressed(views::Button* sender,
-                                const ui::Event& event) {
-  if (close_button_ && sender == close_button_.get()) {
-    controller()->RemoveNotification(notification_id(), true);  // By user.
-  }
-}
-
 void MessageView::OnSlideOut() {
   controller_->RemoveNotification(notification_id_, true);  // By user.
 }
 
 void MessageView::SetDrawBackgroundAsActive(bool active) {
   background_view_->background()->
       SetNativeControlColor(active ? kHoveredButtonBackgroundColor :
                                      kNotificationBackgroundColor);
   SchedulePaint();
 }
 
-void MessageView::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));
-    close->SetTooltipText(l10n_util::GetStringUTF16(
-        IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_TOOLTIP));
-    close->set_owned_by_client();
-    AddChildView(close);
-    close_button_.reset(close);
-  } else if (notification.pinned() && close_button_) {
-    close_button_.reset();
-  }
-}
-
 }  // namespace message_center