Fix a bug of PopupAlignmentDelegate on non-primary display

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 156 matching lines @@
       view = MessageViewFactory::Create(NULL, notification, true);
     } else
 #endif  // defined(OS_CHROMEOS)
     {
       view = MessageViewFactory::Create(NULL, *(*iter), true);
     }
 
     view->set_context_menu_controller(context_menu_controller_.get());
     int view_height = ToastContentsView::GetToastSizeForView(view).height();
     int height_available =
-        top_down ? alignment_delegate_->GetWorkAreaBottom() - base : base;
+        top_down ? alignment_delegate_->GetWorkArea().bottom() - base
+                 : base - alignment_delegate_->GetWorkArea().y();
 
     if (height_available - view_height - kToastMarginY < 0) {
       delete view;
       break;
     }
 
     ToastContentsView* toast = new ToastContentsView(
         (*iter)->id(), alignment_delegate_, weak_factory_.GetWeakPtr());
     // There will be no contents already since this is a new ToastContentsView.
     toast->SetContents(view, /*a11y_feedback_for_updates=*/false);
@@ skipping 100 matching lines @@
   for (Toasts::const_iterator iter = toasts_.begin(); iter != toasts_.end();) {
     Toasts::const_iterator curr = iter++;
     gfx::Rect bounds((*curr)->bounds());
     bounds.set_x(alignment_delegate_->GetToastOriginX(bounds));
     bounds.set_y(top_down ? base : base - bounds.height());
 
     // The notification may scrolls the boundary of the screen due to image
     // load and such notifications should disappear. Do not call
     // CloseWithAnimation, we don't want to show the closing animation, and we
     // don't want to mark such notifications as shown. See crbug.com/233424
-    if ((top_down ? alignment_delegate_->GetWorkAreaBottom() - bounds.bottom()
-                  : bounds.y()) >= 0)
+    if ((top_down
+             ? alignment_delegate_->GetWorkArea().bottom() - bounds.bottom()
+             : bounds.y() - alignment_delegate_->GetWorkArea().y()) >= 0)
       (*curr)->SetBoundsWithAnimation(bounds);
     else
       RemoveToast(*curr, /*mark_as_shown=*/false);
 
     // Shift the base line to be a few pixels above the last added toast or (few
     // pixels below last added toast if top-aligned).
     if (top_down)
       base += bounds.height() + kToastMarginY;
     else
       base -= bounds.height() + kToastMarginY;
@@ skipping 227 matching lines @@
       views::Widget* widget = (*iter)->GetWidget();
       if (widget)
         return widget->GetWindowBoundsInScreen();
       break;
     }
   }
   return gfx::Rect();
 }
 
 }  // namespace message_center