reland "CrOS: Fix appearance of notification toasts when sliding out via gesture"

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/image/image_skia_operations.h"
 #include "ui/gfx/shadow_util.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/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/border.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/widget/widget.h"
 
 namespace {
 
 #if defined(OS_CHROMEOS)
 const int kShadowCornerRadius = 2;
 #else
 const int kShadowCornerRadius = 0;
 #endif
 const int kShadowElevation = 2;
 
@@ skipping 19 matching lines @@
 }
 
 }  // namespace
 
 namespace message_center {
 
 MessageView::MessageView(MessageCenterController* controller,
                          const Notification& notification)
     : controller_(controller),
       notification_id_(notification.id()),
-      notifier_id_(notification.notifier_id()) {
+      notifier_id_(notification.notifier_id()),
+      slide_out_controller_(this, this) {
   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_);
 
   focus_painter_ = views::Painter::CreateSolidFocusPainter(
       kFocusBorderColor, gfx::Insets(0, 1, 3, 2));
 
   UpdateWithNotification(notification);
 }
 
 MessageView::~MessageView() {
 }
 
 void MessageView::UpdateWithNotification(const Notification& notification) {
   display_source_ = notification.display_source();
   accessible_name_ = CreateAccessibleName(notification);
-  set_slide_out_enabled(!notification.pinned());
+  slide_out_controller_.set_enabled(!notification.pinned());
 }
 
 // static
 gfx::Insets MessageView::GetShadowInsets() {
   return -gfx::ShadowValue::GetMargin(
       gfx::ShadowDetails::Get(kShadowElevation, kShadowCornerRadius).values);
 }
 
-void MessageView::CreateShadowBorder() {
+void MessageView::SetIsNested() {
+  is_nested_ = true;
+  SetPaintToLayer();
+  layer()->SetFillsBoundsOpaquely(false);
+
   const auto& shadow =
       gfx::ShadowDetails::Get(kShadowElevation, kShadowCornerRadius);
   gfx::Insets ninebox_insets = gfx::ShadowValue::GetBlurRegion(shadow.values) +
                                gfx::Insets(kShadowCornerRadius);
   SetBorder(views::CreateBorderPainter(
       std::unique_ptr<views::Painter>(views::Painter::CreateImagePainter(
           shadow.ninebox_image, ninebox_insets)),
       -gfx::ShadowValue::GetMargin(shadow.values)));
 }
 
@@ skipping 30 matching lines @@
   // Space key handling is triggerred at key-release timing. See
   // 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) {
-  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);
 #if defined(OS_CHROMEOS)
@@ skipping 22 matching lines @@
       SetDrawBackgroundAsActive(false);
       controller_->ClickOnNotification(notification_id_);
       event->SetHandled();
       return;
     }
     default: {
       // Do nothing
     }
   }
 
-  SlideOutView::OnGestureEvent(event);
-  // Do not return here by checking handled(). SlideOutView calls SetHandled()
-  // even though the scroll gesture doesn't make no (or little) effects on the
-  // slide-out behavior. See http://crbug.com/172991
-
   if (!event->IsScrollGestureEvent() && !event->IsFlingScrollEvent())
     return;
 
   if (scroller_)
     scroller_->OnGestureEvent(event);
   event->SetHandled();
 }
 
+ui::Layer* MessageView::GetSlideOutLayer() {
+  return is_nested_ ? layer() : GetWidget()->GetLayer();
+}
+
+void MessageView::OnSlideOut() {
+  controller_->RemoveNotification(notification_id_, true);  // By user.
+}
+
 void MessageView::OnCloseButtonPressed() {
   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();
 }
 
 }  // namespace message_center