[Notifications] Fix swipe to close for ARC notifications.

ui/arc/notification/arc_custom_notification_view.cc

 // Copyright 2016 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/arc/notification/arc_custom_notification_view.h"
 
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "components/exo/notification_surface.h"
@@ skipping 46 matching lines @@
   // ui::EventHandler
   void OnEvent(ui::Event* event) override {
     // Do not forward event targeted to the floating close button so that
     // keyboard press and tap are handled properly.
     if (owner_->floating_control_buttons_widget_ && event->target() &&
         owner_->floating_control_buttons_widget_->GetNativeWindow() ==
             event->target()) {
       return;
     }
 
-    if (event->IsScrollEvent()) {
-      ForwardScrollEvent(event->AsScrollEvent());
-    } else if (event->IsMouseWheelEvent()) {
-      ForwardMouseWheelEvent(event->AsMouseWheelEvent());
-    } else if (!event->IsTouchEvent() && event->type() != ui::ET_GESTURE_TAP) {
-      // TODO(yoshiki): Use a better tigger (eg. focusing EditText on
-      // notification) than clicking (crbug.com/697379).
-      if (event->type() == ui::ET_MOUSE_PRESSED)
-        owner_->ActivateToast();
+    // TODO(yoshiki): Use a better tigger (eg. focusing EditText on
+    // notification) than clicking (crbug.com/697379).
+    if (event->type() == ui::ET_MOUSE_PRESSED)
+      owner_->ActivateToast();
 
-      // Forward the rest events to |owner_| except for:
-      // 1. Touches, because View should no longer receive touch events.
-      //    See View::OnTouchEvent.
-      // 2. Tap gestures are handled on the Android side, so ignore them.
-      //    See crbug.com/709911.
-      owner_->OnEvent(event);
-    }
-  }
-
-  void ForwardScrollEvent(ui::ScrollEvent* event) {
     views::Widget* widget = owner_->GetWidget();
     if (!widget)
       return;
 
-    event->target()->ConvertEventToTarget(widget->GetNativeWindow(), event);
-    widget->OnScrollEvent(event);
-  }
-
-  void ForwardMouseWheelEvent(ui::MouseWheelEvent* event) {
-    views::Widget* widget = owner_->GetWidget();
-    if (!widget)
-      return;
-
-    event->target()->ConvertEventToTarget(widget->GetNativeWindow(), event);
-    widget->OnMouseEvent(event);
+    // Forward the events to the containing widget, except for:
+    // 1. Touches, because View should no longer receive touch events.
+    //    See View::OnTouchEvent.
+    // 2. Tap gestures are handled on the Android side, so ignore them.
+    //    See crbug.com/709911.
+    // 3. Key events. These are already forwarded by NotificationSurface's
+    //    WindowDelegate.
+    if (event->IsLocatedEvent()) {
+      ui::LocatedEvent* located_event = event->AsLocatedEvent();
+      located_event->target()->ConvertEventToTarget(widget->GetNativeWindow(),
+                                                    located_event);
+      if (located_event->type() == ui::ET_MOUSE_MOVED)
+        widget->OnMouseEvent(located_event->AsMouseEvent());
+      else if (located_event->IsScrollEvent())
+        widget->OnScrollEvent(located_event->AsScrollEvent());
+      else if (located_event->IsGestureEvent() &&
+               event->type() != ui::ET_GESTURE_TAP)
+        widget->OnGestureEvent(located_event->AsGestureEvent());

[xiyuan, 2017/05/16 16:27:58]

nit: wrap with {} for all branches

[Eliot Courtney, 2017/05/17 04:48:25]

Done.

+    }
   }
 
   ArcCustomNotificationView* const owner_;
 
   DISALLOW_COPY_AND_ASSIGN(EventForwarder);
 };
 
 class ArcCustomNotificationView::SlideHelper
     : public ui::LayerAnimationObserver {
  public:
@@ skipping 83 matching lines @@
   void RequestFocusOnCloseButton() override {
     if (owner_->close_button_)
       owner_->close_button_->RequestFocus();
     owner_->UpdateControlButtonsVisibility();
   }
 
   void UpdateControlButtonsVisibility() override {
     owner_->UpdateControlButtonsVisibility();
   }
 
+  void OnSlideChanged() override {
+    if (owner_->slide_helper_)
+      owner_->slide_helper_->Update();
+  }
+
  private:
   ArcCustomNotificationView* const owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewDelegate);
 };
 
 ArcCustomNotificationView::ControlButton::ControlButton(
     ArcCustomNotificationView* owner)
     : message_center::PaddedButton(owner), owner_(owner) {
   if (owner_->item_) {
@@ skipping 350 matching lines @@
   // Bail if there is a |surface_| or no item or no snapshot image.
   if (surface_ || !item_ || item_->GetSnapshot().isNull())
     return;
   const gfx::Rect contents_bounds = GetContentsBounds();
   canvas->DrawImageInt(item_->GetSnapshot(), 0, 0, item_->GetSnapshot().width(),
                        item_->GetSnapshot().height(), contents_bounds.x(),
                        contents_bounds.y(), contents_bounds.width(),
                        contents_bounds.height(), false);
 }
 
-void ArcCustomNotificationView::OnKeyEvent(ui::KeyEvent* event) {
-  // Forward to parent CustomNotificationView to handle keyboard dismissal.
-  parent()->OnKeyEvent(event);
-}
-
-void ArcCustomNotificationView::OnGestureEvent(ui::GestureEvent* event) {
-  // Forward to parent CustomNotificationView to handle sliding out.
-  parent()->OnGestureEvent(event);
-
-  // |slide_helper_| could be null before |surface_| is attached.
-  if (slide_helper_)
-    slide_helper_->Update();
-}
-
 void ArcCustomNotificationView::OnMouseEntered(const ui::MouseEvent&) {
   UpdateControlButtonsVisibility();
 }
 
 void ArcCustomNotificationView::OnMouseExited(const ui::MouseEvent&) {
   UpdateControlButtonsVisibility();
 }
 
 void ArcCustomNotificationView::OnFocus() {
   CHECK_EQ(message_center::CustomNotificationView::kViewClassName,
@@ skipping 128 matching lines @@
     }
     if (close_button_) {
       close_button_->set_background(
           views::Background::CreateSolidBackground(current_color));
       close_button_->SchedulePaint();
     }
   }
 }
 
 }  // namespace arc