Switch Windows to use the MessagePopupCollection

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

Index: chrome/browser/ui/views/message_center/web_notification_tray_win.cc
diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_win.cc b/chrome/browser/ui/views/message_center/web_notification_tray_win.cc
index 38a023894f11f367dbf4405e306001ad942543f3..1cdecabb99efeb159398a19ffe16c9e0d5e72ca8 100644
--- a/chrome/browser/ui/views/message_center/web_notification_tray_win.cc
+++ b/chrome/browser/ui/views/message_center/web_notification_tray_win.cc
@@ -25,7 +25,7 @@
 #include "ui/message_center/message_center_tray_delegate.h"
 #include "ui/message_center/views/message_bubble_base.h"
 #include "ui/message_center/views/message_center_bubble.h"
-#include "ui/message_center/views/message_popup_bubble.h"
+#include "ui/message_center/views/message_popup_collection.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
@@ -120,17 +120,13 @@ message_center::MessageCenter* WebNotificationTrayWin::message_center() {
 }
 
 bool WebNotificationTrayWin::ShowPopups() {
-  scoped_ptr<message_center::MessagePopupBubble> bubble(
-      new message_center::MessagePopupBubble(message_center()));
-  popup_bubble_.reset(new internal::NotificationBubbleWrapperWin(
-      this,
-      bubble.Pass(),
-      internal::NotificationBubbleWrapperWin::BUBBLE_TYPE_POPUP));
+  popup_collection_.reset(
+      new message_center::MessagePopupCollection(NULL, message_center()));

[Jun Mukai, 2013/03/12 00:49:54]

You should specify the first argument, otherwise (I guess) it will crash on
win-aura.
It can be any of aura window, so getting the active browser window from
g_browser_process would be fine.

see comments in ui/views/widget/widget.h: "NULL is not allowed if you are using
aura."
and message_popup_collection.cc specifies params.context from this.

[dewittj, 2013/03/12 00:57:10]

The #ifdef inside mesage_popup_collection.cc prevents the crash.  I have run
this on win-aura, so I know it isn't crashing :)
There isn't guaranteed to be an active browser window - suppose they're all
closed!  Additionally, I don't know of a method of g_browser_process that gives
you the default window.  Could you point me there?

[Jun Mukai, 2013/03/12 01:27:11]

Hmm, I still don't get the point why win-aura is safe in CreateWidget (because
it passes NULL to params.context), but anyway that's fine if no crash happens.

[dewittj, 2013/03/13 18:38:16]

Elliot's feedback was that the comment is wrong - NULL is okay, so long as
top_level is true.

   return true;
 }
 
 void WebNotificationTrayWin::HidePopups() {
-  popup_bubble_.reset();
+  popup_collection_.reset();
 }
 
 bool WebNotificationTrayWin::ShowMessageCenter() {
@@ -177,8 +173,8 @@ void WebNotificationTrayWin::UpdateMessageCenter() {
 }
 
 void WebNotificationTrayWin::UpdatePopups() {
-  if (popup_bubble_.get())
-    popup_bubble_->bubble()->ScheduleUpdate();
+  if (popup_collection_.get())
+    popup_collection_->UpdatePopups();
 };
 
 void WebNotificationTrayWin::OnMessageCenterTrayChanged() {
@@ -244,9 +240,6 @@ void WebNotificationTrayWin::HideBubbleWithView(
   if (message_center_bubble_.get() &&
       bubble_view == message_center_bubble_->bubble_view()) {
     message_center_tray_->HideMessageCenterBubble();
-  } else if (popup_bubble_.get() &&
-      bubble_view == popup_bubble_->bubble_view()) {
-    message_center_tray_->HidePopupBubble();
   }
 }
 
@@ -263,12 +256,4 @@ WebNotificationTrayWin::GetMessageCenterBubbleForTest() {
       message_center_bubble_->bubble());
 }
 
-message_center::MessagePopupBubble*
-WebNotificationTrayWin::GetPopupBubbleForTest() {
-  if (!popup_bubble_.get())
-    return NULL;
-  return static_cast<message_center::MessagePopupBubble*>(
-      popup_bubble_->bubble());
-}
-
 }  // namespace message_center