Switch Windows to use the MessagePopupCollection

chrome/browser/ui/views/message_center/web_notification_tray_win.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 "chrome/browser/ui/views/message_center/web_notification_tray_win.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/ui/views/message_center/notification_bubble_wrapper_win.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 #include "grit/chromium_strings.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_center_tray.h"
 #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 {
 
 // Tray constants
 const int kScreenEdgePadding = 2;
 
 gfx::Rect GetCornerAnchorRect() {
   // TODO(dewittj): Use the preference to determine which corner to anchor from.
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();
@@ skipping 74 matching lines @@
   StatusTray* status_tray = g_browser_process->status_tray();
   status_tray->RemoveStatusIcon(status_icon_);
   status_icon_ = NULL;
 }
 
 message_center::MessageCenter* WebNotificationTrayWin::message_center() {
   return message_center_tray_->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() {
   scoped_ptr<message_center::MessageCenterBubble> bubble(
       new message_center::MessageCenterBubble(message_center()));
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();
   gfx::Rect work_area = screen->GetPrimaryDisplay().work_area();
   views::TrayBubbleView::AnchorAlignment alignment = GetAnchorAlignment();
 
   int max_height = work_area.height();
@@ skipping 26 matching lines @@
 void WebNotificationTrayWin::HideMessageCenter() {
   message_center_bubble_.reset();
 }
 
 void WebNotificationTrayWin::UpdateMessageCenter() {
   if (message_center_bubble_.get())
     message_center_bubble_->bubble()->ScheduleUpdate();
 }
 
 void WebNotificationTrayWin::UpdatePopups() {
-  if (popup_bubble_.get())
-    popup_bubble_->bubble()->ScheduleUpdate();
+  if (popup_collection_.get())
+    popup_collection_->UpdatePopups();
 };
 
 void WebNotificationTrayWin::OnMessageCenterTrayChanged() {
   UpdateStatusIcon();
 }
 
 gfx::Rect WebNotificationTrayWin::GetMessageCenterAnchor() {
   return GetMouseAnchorRect(mouse_click_point_);
 }
 
@@ skipping 45 matching lines @@
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();
   mouse_click_point_ = screen->GetCursorScreenPoint();
   message_center_tray_->ToggleMessageCenterBubble();
 }
 
 void WebNotificationTrayWin::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {
   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();
   }
 }
 
 void WebNotificationTrayWin::AddQuietModeMenu(StatusIcon* status_icon) {
   DCHECK(status_icon);
   status_icon->SetContextMenu(message_center_tray_->CreateQuietModeMenu());
 }
 
 message_center::MessageCenterBubble*
 WebNotificationTrayWin::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble_.get())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       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