Reland: Make popup notification active on being clicked

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"
 #include "components/exo/surface.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/display/screen.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/transform.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/custom_notification_view.h"
 #include "ui/message_center/views/padded_button.h"
+#include "ui/message_center/views/toast_contents_view.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/focus/focus_manager.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 15 matching lines @@
         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()) {
+      // 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 touches because View
       // should no longer receive touch events. See View::OnTouchEvent.
       owner_->OnEvent(event);
     }
   }
 
   void ForwardScrollEvent(ui::ScrollEvent* event) {
     views::Widget* widget = owner_->GetWidget();
     if (!widget)
       return;
@@ skipping 421 matching lines @@
   static_cast<message_center::CustomNotificationView*>(parent())
       ->OnContentFocused();
 }
 
 void ArcCustomNotificationView::OnBlur() {
   NativeViewHost::OnBlur();
   static_cast<message_center::CustomNotificationView*>(parent())
       ->OnContentBlured();
 }
 
+void ArcCustomNotificationView::ActivateToast() {
+  if (message_center::ToastContentsView::kViewClassName ==
+      parent()->parent()->GetClassName()) {
+    static_cast<message_center::ToastContentsView*>(parent()->parent())
+        ->ActivateToast();
+  }
+}
+
 views::FocusTraversable* ArcCustomNotificationView::GetFocusTraversable() {
   if (floating_control_buttons_widget_)
     return static_cast<views::internal::RootView*>(
         floating_control_buttons_widget_->GetRootView());
   return nullptr;
 }
 
 void ArcCustomNotificationView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   if (item_ && !item_->pinned() && sender == close_button_) {
@@ skipping 43 matching lines @@
 
 void ArcCustomNotificationView::OnNotificationSurfaceRemoved(
     exo::NotificationSurface* surface) {
   if (surface->notification_id() != notification_key_)
     return;
 
   SetSurface(nullptr);
 }
 
 }  // namespace arc