Move close button to MessageView

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 "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/ui_base_switches_util.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 {
 
+const int kCloseIconTopPadding = 5;

[dewittj, 2016/05/13 20:28:35]

nit: I think that constexpr is slightly preferred now.

[xiyuan, 2016/05/13 22:31:00]

Done.

+const int kCloseIconRightPadding = 5;
+
 const int kShadowOffset = 1;
 const int kShadowBlur = 4;
 
 }  // namespace
 
 namespace message_center {
 
 MessageView::MessageView(MessageCenterController* controller,
-                         const std::string& notification_id,
-                         const NotifierId& notifier_id,
-                         const gfx::ImageSkia& small_image,
-                         const base::string16& display_source)
+                         const Notification& notification)
     : controller_(controller),
-      notification_id_(notification_id),
-      notifier_id_(notifier_id),
-      background_view_(NULL),
-      scroller_(NULL),
-      display_source_(display_source) {
+      notification_id_(notification.id()),
+      notifier_id_(notification.notifier_id()),
+      display_source_(notification.display_source()) {
   SetFocusBehavior(FocusBehavior::ALWAYS);
 
   // Create the opaque background that's above the view's shadow.
   background_view_ = new views::View();
   background_view_->set_background(
       views::Background::CreateSolidBackground(kNotificationBackgroundColor));
   AddChildView(background_view_);
 
   views::ImageView* small_image_view = new views::ImageView();
-  small_image_view->SetImage(small_image);
+  small_image_view->SetImage(notification.small_image().AsImageSkia());
   small_image_view->SetImageSize(gfx::Size(kSmallImageSize, kSmallImageSize));
   // The small image view should be added to view hierarchy by the derived
   // class. This ensures that it is on top of other views.
   small_image_view->set_owned_by_client();
   small_image_view_.reset(small_image_view);
 
   focus_painter_ = views::Painter::CreateSolidFocusPainter(
       kFocusBorderColor, gfx::Insets(0, 1, 3, 2));
 }
 
 MessageView::~MessageView() {
 }
 
 void MessageView::UpdateWithNotification(const Notification& notification) {
   small_image_view_->SetImage(notification.small_image().AsImageSkia());
   display_source_ = notification.display_source();
+  CreateOrUpdateCloseButtonView(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() {
-  // May be overridden by the owner of the close button.
-  return false;
+  if (!close_button_)
+    return false;
+
+  views::FocusManager* focus_manager = GetFocusManager();
+  return focus_manager &&
+         focus_manager->GetFocusedView() == close_button_.get();
 }
 
 void MessageView::RequestFocusOnCloseButton() {
-  // May be overridden by the owner of the close button.
+  if (close_button_)
+    close_button_->RequestFocus();
 }
 
 bool MessageView::IsPinned() {
-  return false;
+  return !close_button_;
 }
 
 void MessageView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_BUTTON;
   state->name = accessible_name_;
 }
 
 bool MessageView::OnMousePressed(const ui::MouseEvent& event) {
   if (!event.IsOnlyLeftMouseButton())
     return false;
@@ skipping 23 matching lines @@
   // ui/views/controls/buttons/custom_button.cc for why.
   if (event.flags() != ui::EF_NONE || event.flags() != 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 26 matching lines @@
   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) {
   if (!switches::IsTouchFeedbackEnabled())
     return;
   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->set_owned_by_client();
+    AddChildView(close);
+    close_button_.reset(close);
+  } else if (notification.pinned() && close_button_) {
+    close_button_.reset();
+  }
+}
+
 }  // namespace message_center