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 is_primary_display =
+      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, since
+    // currently custom notification supports only on one display at the same
+    // time.
+    // TODO(yoshiki): Support custom popup notification on multiple display
+    // (crbug.com/715370).
+    if (!is_primary_display && (*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 370 matching lines @@
       views::Widget* widget = (*iter)->GetWidget();
       if (widget)
         return widget->GetWindowBoundsInScreen();
       break;
     }
   }
   return gfx::Rect();
 }
 
 }  // namespace message_center