Revert 188217 "Switch Windows to use the MessagePopupCollection"

chrome/browser/ui/views/message_center/web_notification_tray_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_
 #define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_
 
 #include "chrome/browser/status_icons/status_icon_observer.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_tray_delegate.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
 class StatusIcon;
 
 namespace message_center {
 class MessageCenter;
 class MessageCenterBubble;
-class MessagePopupCollection;
+class MessagePopupBubble;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace message_center {
 
 namespace internal {
 class NotificationBubbleWrapperWin;
@@ skipping 38 matching lines @@
 
  private:
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest, WebNotifications);
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest,
                            WebNotificationPopupBubble);
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest,
                            ManyMessageCenterNotifications);
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest, ManyPopupNotifications);
 
   void AddQuietModeMenu(StatusIcon* status_icon);
+  message_center::MessagePopupBubble* GetPopupBubbleForTest();
   message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
 
+  scoped_ptr<internal::NotificationBubbleWrapperWin> popup_bubble_;
   scoped_ptr<internal::NotificationBubbleWrapperWin> message_center_bubble_;
-  scoped_ptr<message_center::MessagePopupCollection> popup_collection_;
 
   StatusIcon* status_icon_;
   bool message_center_visible_;
   scoped_ptr<MessageCenterTray> message_center_tray_;
   gfx::Point mouse_click_point_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayWin);
 };
 
 }  // namespace message_center
 
 #endif  // CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_