Revert 188217 "Switch Windows to use the MessagePopupCollection"

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/timer.h"
@@ skipping 29 matching lines @@
     int seconds = kAutocloseDefaultDelaySeconds;
     if (notification->priority() > DEFAULT_PRIORITY)
       seconds = kAutocloseHighPriorityDelaySeconds;
     delay_ = base::TimeDelta::FromSeconds(seconds);
   }
 
   views::Widget* CreateWidget(gfx::NativeView context) {
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.keep_on_top = true;
-    if (context)
-      params.context = context;
-    else
-      params.top_level = true;
+    params.context = context;
     params.transparent = true;
     // The origin of the initial bounds are set to (0, 0). It'll then moved by
     // MessagePopupCollection.
     params.bounds = gfx::Rect(
         gfx::Size(kWebNotificationWidth,
                   GetHeightForWidth(kWebNotificationWidth)));
     params.delegate = this;
     views::Widget* widget = new views::Widget();
     widget->Init(params);
     return widget;
@@ skipping 78 matching lines @@
 
 void MessagePopupCollection::UpdatePopups() {
   NotificationList::PopupNotifications popups =
       message_center_->notification_list()->GetPopupNotifications();
 
   if (popups.empty()) {
     CloseAllWidgets();
     return;
   }
 
-  gfx::Rect work_area;
-  if (!context_) {
-    // On Win+Aura, we don't have a context since the popups currently show up
-    // on the Windows desktop, not in the Aura/Ash desktop.  This code will
-    // display the popups on the primary display.
-    gfx::Screen* screen = gfx::Screen::GetNativeScreen();
-    work_area = screen->GetPrimaryDisplay().work_area();
-  } else {
-    gfx::Screen* screen = gfx::Screen::GetScreenFor(context_);
-    work_area = screen->GetDisplayNearestWindow(context_).work_area();
-  }
+  gfx::Screen* screen = gfx::Screen::GetScreenFor(context_);
+  gfx::Rect work_area = screen->GetDisplayNearestWindow(context_).work_area();
 
   std::set<std::string> old_toast_ids;
   for (ToastContainer::iterator iter = toasts_.begin(); iter != toasts_.end();
        ++iter) {
     old_toast_ids.insert(iter->first);
   }
 
   int bottom = work_area.bottom() - kMarginBetweenItems;
   int left = work_area.right() - kWebNotificationWidth - kMarginBetweenItems;
   // Iterate in the reverse order to keep the oldest toasts on screen. Newer
@@ skipping 85 matching lines @@
       message_center_->notification_list()->MarkSinglePopupAsShown(
           iter->first, false);
       toasts_.erase(iter);
       break;
     }
   }
   UpdatePopups();
 }
 
 }  // namespace message_center