Hide popup custom notifications on non-primary displays

ui/message_center/views/message_popup_collection.cc

 // Copyright (c) 2013 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_popup_collection.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 155 matching lines @@
 
   NotificationList::PopupNotifications popups =
       message_center_->GetPopupNotifications();
   if (popups.empty()) {
     CloseAllWidgets();
     return;
   }
 
   bool top_down = alignment_delegate_->IsTopDown();
   int base = GetBaseLine(toasts_.empty() ? NULL : toasts_.back());
+#if defined(OS_CHROMEOS)
+  bool isPrimaryDisplay =
+      alignment_delegate_->IsPrimaryDisplayForNotification();
+#endif
 
   // Iterate in the reverse order to keep the oldest toasts on screen. Newer
   // items may be ignored if there are no room to place them.
   for (NotificationList::PopupNotifications::const_reverse_iterator iter =
            popups.rbegin(); iter != popups.rend(); ++iter) {
     if (FindToast((*iter)->id()))
       continue;
 
+#if defined(OS_CHROMEOS)
+    // Disables popup of custom notification on non-primary displays.
+    // Chrome OS shows popups on all displays but custom notification can be
+    // visible only on one display at the same time.
+    if (!isPrimaryDisplay && (*iter)->type() == NOTIFICATION_TYPE_CUSTOM)
+      continue;
+#endif
+
     MessageView* view;
     // Create top-level notification.
 #if defined(OS_CHROMEOS)
     if ((*iter)->pinned()) {
       Notification notification = *(*iter);
       // Override pinned status, since toasts should be closable even when it's
       // pinned.
       notification.set_pinned(false);
       view = MessageViewFactory::Create(NULL, notification, true);
     } else
@@ skipping 38 matching lines @@
     if (top_down)
       base += view_height + kToastMarginY;
     else
       base -= view_height + kToastMarginY;
 
     if (views::ViewsDelegate::GetInstance()) {
       views::ViewsDelegate::GetInstance()->NotifyAccessibilityEvent(
           toast, ui::AX_EVENT_ALERT);
     }
 
+    LOG(ERROR) << "POPUP: " << (*iter)->id();

[yhanada, 2017/04/21 09:02:23]

remove?

[yoshiki, 2017/04/21 09:58:05]

Done.

     message_center_->DisplayedNotification(
         (*iter)->id(), message_center::DISPLAY_SOURCE_POPUP);
   }
 }
 
 void MessagePopupCollection::OnMouseEntered(ToastContentsView* toast_entered) {
   // Sometimes we can get two MouseEntered/MouseExited in a row when animating
   // toasts.  So we need to keep track of which one is the currently active one.
   latest_toast_entered_ = toast_entered;
 
@@ skipping 312 matching lines @@
       views::Widget* widget = (*iter)->GetWidget();
       if (widget)
         return widget->GetWindowBoundsInScreen();
       break;
     }
   }
   return gfx::Rect();
 }
 
 }  // namespace message_center