Implement message center on Windows

ash/system/web_notification/web_notification_tray.cc

 // Copyright (c) 2012 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 "ash/system/web_notification/web_notification_tray.h"
 
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
+#include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
-#include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_views.h"
 #include "ash/wm/shelf_layout_manager.h"
-#include "base/message_loop.h"
-#include "base/stringprintf.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/screen.h"
+#include "ui/message_center/message_bubble_base.h"
 #include "ui/message_center/message_center_bubble.h"
+#include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_popup_bubble.h"
 #include "ui/message_center/quiet_mode_bubble.h"
 #include "ui/views/bubble/tray_bubble_view.h"
-#include "ui/views/widget/widget_observer.h"
 
-namespace {
+#if defined(ENABLE_MESSAGE_CENTER) && !defined(OS_WIN)
+namespace chrome {
 
-// Tray constants
-const int kTrayContainerVerticalPaddingBottomAlignment = 3;
-const int kTrayContainerHorizontalPaddingBottomAlignment = 1;
-const int kTrayContainerVerticalPaddingVerticalAlignment = 1;
-const int kTrayContainerHorizontalPaddingVerticalAlignment = 0;
-const int kPaddingFromLeftEdgeOfSystemTrayBottomAlignment = 8;
-const int kPaddingFromTopEdgeOfSystemTrayVerticalAlignment = 10;
+ui::MessageCenterTrayDelegate* GetMessageCenterTray() {
+  return ash::Shell::GetPrimaryRootWindowController()->status_area_widget()->
+      web_notification_tray();
+}

[stevenjb, 2013/01/18 23:11:46]

This does not belong here, it needs to be in src/chrome

[dewittj, 2013/01/20 19:02:06]

This is now a static method on MessageCenterTrayDelegate.

 
-}  // namespace
+}  // namespace chrome
+#endif
+
 
 namespace ash {
 
 namespace internal {
 
 // Class to initialize and manage the WebNotificationBubble and
 // TrayBubbleWrapper instances for a bubble.
 
 class WebNotificationBubbleWrapper {
  public:
@@ skipping 14 matching lines @@
     views::TrayBubbleView* bubble_view = views::TrayBubbleView::Create(
         tray->GetBubbleWindowContainer(), anchor, tray, &init_params);
     bubble_wrapper_.reset(new TrayBubbleWrapper(tray, bubble_view));
     bubble->InitializeContents(bubble_view);
   }
 
   message_center::MessageBubbleBase* bubble() const { return bubble_.get(); }
 
   // Convenience accessors.
   views::TrayBubbleView* bubble_view() const { return bubble_->bubble_view(); }
+  views::Widget* bubble_widget() const {
+    return bubble_wrapper_->bubble_widget();
+  }
 
  private:
   scoped_ptr<message_center::MessageBubbleBase> bubble_;
   scoped_ptr<internal::TrayBubbleWrapper> bubble_wrapper_;
 };
 
 }  // namespace internal
 
 WebNotificationTray::WebNotificationTray(
     internal::StatusAreaWidget* status_area_widget)
-    : internal::TrayBackgroundView(status_area_widget),
+    : TrayBackgroundView(status_area_widget),
       button_(NULL),
       show_message_center_on_unlock_(false) {
-  message_center_ = message_center::MessageCenter::GetInstance();
-  message_center_->AddObserver(this);
   button_ = new views::ImageButton(this);
   button_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
   tray_container()->AddChildView(button_);
   SetVisible(false);
-  UpdateTray();
+  message_center_tray_ = make_scoped_ptr(new ui::MessageCenterTray(this));

[stevenjb, 2013/01/18 23:11:46]

message_center_tray_.reset(new ...)

[dewittj, 2013/01/20 19:02:06]

Done.

[Pete Williamson, 2013/01/23 19:52:16]

Since WNT creates MCT, how does the outside world get to know about MCT to send
notifications through it?  Furthermore, how does MessageCenter get hooked up to
MCT?

[dewittj, 2013/01/23 22:07:51]

The outside world adds notifications to the global MessageCenter object. 
MessageCenterTray looks up the global MessageCenter object.

+  OnMessageCenterTrayChanged();
 }
 
 WebNotificationTray::~WebNotificationTray() {
-  // Ensure the message center doesn't notify a destroyed object.
-  message_center_->RemoveObserver(this);
   // Release any child views that might have back pointers before ~View().
   message_center_bubble_.reset();
   popup_bubble_.reset();
   if (quiet_mode_bubble() && quiet_mode_bubble_->GetBubbleWidget())
     quiet_mode_bubble_->GetBubbleWidget()->RemoveObserver(this);
   quiet_mode_bubble_.reset();
 }
 
-void WebNotificationTray::ShowMessageCenterBubble() {
-  if (status_area_widget()->login_status() == user::LOGGED_IN_LOCKED)
-    return;
-  if (quiet_mode_bubble())
-    quiet_mode_bubble_.reset();
-  if (message_center_bubble()) {
-    UpdateTray();
-    return;
-  }
-  // Indicate that the message center is visible. Clears the unread count.
-  message_center_->SetMessageCenterVisible(true);
-  UpdateTray();
-  HidePopupBubble();
-  message_center::MessageCenterBubble* bubble =
-      new message_center::MessageCenterBubble(message_center_);
-  // Sets the maximum height of the bubble based on the screen.
+// Public methods.
+
+bool WebNotificationTray::ShowMessageCenter(
+    message_center::MessageBubbleBase* message_center_bubble) {
+  if (!ShouldShowMessageCenter())
+    return false;
+
   // TODO(mukai): move this to WebNotificationBubbleWrapper if it's safe
   // to set the height of the popup.
   int max_height = 0;
   if (GetShelfLayoutManager()->GetAlignment() == SHELF_ALIGNMENT_BOTTOM) {
     gfx::Rect shelf_bounds = GetShelfLayoutManager()->GetIdealBounds();
     max_height = shelf_bounds.y();
   } else {
     // Assume that the bottom line of the status area widget and the bubble are
     // aligned.
     aura::Window* status_area_window = status_area_widget()->GetNativeWindow();
     max_height = status_area_window->GetBoundsInRootWindow().bottom();
   }
-  bubble->SetMaxHeight(max_height);
+  message_center_bubble->SetMaxHeight(max_height);
   message_center_bubble_.reset(
-      new internal::WebNotificationBubbleWrapper(this, bubble));
+      new internal::WebNotificationBubbleWrapper(this, message_center_bubble));
 
   status_area_widget()->SetHideSystemNotifications(true);
   GetShelfLayoutManager()->UpdateAutoHideState();
+
+  return true;
 }
 
-void WebNotificationTray::HideMessageCenterBubble() {
+void WebNotificationTray::UpdateMessageCenter() {
+  if (message_center_bubble())
+    message_center_bubble_->bubble()->ScheduleUpdate();
+}
+
+void WebNotificationTray::HideMessageCenter() {
   if (!message_center_bubble())
     return;
   message_center_bubble_.reset();
   show_message_center_on_unlock_ = false;
-  message_center_->SetMessageCenterVisible(false);
-  UpdateTray();
   status_area_widget()->SetHideSystemNotifications(false);
   GetShelfLayoutManager()->UpdateAutoHideState();
 }
 
 void WebNotificationTray::SetHidePopupBubble(bool hide) {
   if (hide)
-    HidePopupBubble();
+    message_center_tray_->HidePopupBubble();
   else
-    ShowPopupBubble();
+    message_center_tray_->ShowPopupBubble();
 }
 
-void WebNotificationTray::ShowPopupBubble() {
-  if (status_area_widget()->login_status() == user::LOGGED_IN_LOCKED)
-    return;
-  if (message_center_bubble())
-    return;
-  if (!status_area_widget()->ShouldShowWebNotifications())
-    return;
-  UpdateTray();
-  if (popup_bubble()) {
-    popup_bubble()->bubble()->ScheduleUpdate();
-  } else if (message_center_->HasPopupNotifications()) {
-    popup_bubble_.reset(
-        new internal::WebNotificationBubbleWrapper(
-            this, new message_center::MessagePopupBubble(
-                message_center_)));
-  }
+bool WebNotificationTray::ShowPopups(
+    message_center::MessageBubbleBase* popup_bubble) {
+  if (status_area_widget()->login_status() == user::LOGGED_IN_LOCKED ||
+      message_center_bubble() ||
+      !status_area_widget()->ShouldShowWebNotifications())
+    return false;
+  popup_bubble_.reset(new internal::WebNotificationBubbleWrapper(
+      this,
+      popup_bubble));

[stevenjb, 2013/01/18 23:11:46]

nit: this can be on the same line as 'this,'

[dewittj, 2013/01/20 19:02:06]

Done.

+  return true;
 }
 
-void WebNotificationTray::HidePopupBubble() {
+void WebNotificationTray::UpdatePopups() {
+  if (popup_bubble())
+    popup_bubble_->bubble()->ScheduleUpdate();
+};
+
+void WebNotificationTray::HidePopups() {
   popup_bubble_.reset();
 }
 
+// Private methods.
+
+bool WebNotificationTray::ShouldShowMessageCenter() {
+  return status_area_widget()->login_status() != user::LOGGED_IN_LOCKED &&
+      status_area_widget()->ShouldShowWebNotifications();
+}
+
 bool WebNotificationTray::ShouldShowQuietModeBubble(const ui::Event& event) {
   // TODO(mukai): Add keyboard event handler.
   if (!event.IsMouseEvent())
     return false;
 
   const ui::MouseEvent* mouse_event =
       static_cast<const ui::MouseEvent*>(&event);
 
   return mouse_event->IsRightMouseButton();
 }
 
 void WebNotificationTray::ShowQuietModeBubble() {
   aura::Window* parent = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(),
       internal::kShellWindowId_SettingBubbleContainer);
   quiet_mode_bubble_.reset(new message_center::QuietModeBubble(
-      button_, parent, message_center_->notification_list()));
+      button_,
+      parent,
+      message_center_tray_->message_center()->notification_list()));
   quiet_mode_bubble_->GetBubbleWidget()->StackAtTop();
   quiet_mode_bubble_->GetBubbleWidget()->AddObserver(this);
 }
 
 void WebNotificationTray::UpdateAfterLoginStatusChange(
     user::LoginStatus login_status) {
   if (login_status == user::LOGGED_IN_LOCKED) {
-    if (message_center_bubble()) {
-      message_center_bubble_.reset();
+    bool hidden = message_center_tray_->HideMessageCenterBubble();
+    if (hidden)
       show_message_center_on_unlock_ = true;
-    }
-    HidePopupBubble();
+    message_center_tray_->HidePopupBubble();
   } else {
     if (show_message_center_on_unlock_)
-      ShowMessageCenterBubble();
+      message_center_tray_->ShowMessageCenterBubble();
     show_message_center_on_unlock_ = false;
   }
   // The status icon should be always visible except for lock screen / login
   // screen, to allow quiet mode and settings.
   SetVisible((login_status != user::LOGGED_IN_NONE) &&
              (login_status != user::LOGGED_IN_LOCKED));
-  UpdateTray();
+  OnMessageCenterTrayChanged();
 }
 
 bool WebNotificationTray::ShouldBlockLauncherAutoHide() const {
   return IsMessageCenterBubbleVisible() || quiet_mode_bubble() != NULL;
 }
 
 bool WebNotificationTray::IsMessageCenterBubbleVisible() const {
   return (message_center_bubble() &&
           message_center_bubble_->bubble()->IsVisible());
 }
 
 bool WebNotificationTray::IsMouseInNotificationBubble() const {
   if (!popup_bubble())
     return false;
   return popup_bubble_->bubble_view()->GetBoundsInScreen().Contains(
       Shell::GetScreen()->GetCursorScreenPoint());
 }
 
 void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
-  internal::TrayBackgroundView::SetShelfAlignment(alignment);
+  SetShelfAlignment(alignment);

[Pete Williamson, 2013/01/23 19:52:16]

Hmm, I don't see this function in the file, where is it, is this recursive?

[dewittj, 2013/01/23 22:07:51]

Good catch, that must have been a merge issue.  Reverted that part of the
change.

   // Destroy any existing bubble so that it will be rebuilt correctly.
-  HideMessageCenterBubble();
-  HidePopupBubble();
+  message_center_tray_->HideMessageCenterBubble();
+  message_center_tray_->HidePopupBubble();
 }
 
 void WebNotificationTray::AnchorUpdated() {
   if (popup_bubble_.get()) {
     popup_bubble_->bubble_view()->UpdateBubble();
     // Ensure that the notification buble is above the launcher/status area.
     popup_bubble_->bubble_view()->GetWidget()->StackAtTop();
     UpdateBubbleViewArrow(popup_bubble_->bubble_view());
   }
   if (message_center_bubble_.get()) {
     message_center_bubble_->bubble_view()->UpdateBubble();
     UpdateBubbleViewArrow(message_center_bubble_->bubble_view());
   }
   // Quiet mode settings bubble has to be on top.
   if (quiet_mode_bubble() && quiet_mode_bubble_->GetBubbleWidget())
     quiet_mode_bubble_->GetBubbleWidget()->StackAtTop();
 }
 
 string16 WebNotificationTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(
       IDS_ASH_WEB_NOTIFICATION_TRAY_ACCESSIBLE_NAME);
 }
 
 void WebNotificationTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {
   if (message_center_bubble() &&
       bubble_view == message_center_bubble()->bubble_view()) {
-    HideMessageCenterBubble();
+    message_center_tray_->HideMessageCenterBubble();
   } else if (popup_bubble() && bubble_view == popup_bubble()->bubble_view()) {
-    HidePopupBubble();
+    message_center_tray_->HidePopupBubble();
   }
 }
 
 bool WebNotificationTray::PerformAction(const ui::Event& event) {
   if (!quiet_mode_bubble() && ShouldShowQuietModeBubble(event)) {
     ShowQuietModeBubble();
     return true;
   }
   quiet_mode_bubble_.reset();
-  ToggleMessageCenterBubble();
+  if (message_center_bubble())
+    message_center_tray_->HideMessageCenterBubble();
+  else
+    message_center_tray_->ShowMessageCenterBubble();
   return true;
 }
 
+void WebNotificationTray::ShowMessageCenter() {
+  message_center_tray_->ShowMessageCenterBubble();
+}
+
 void WebNotificationTray::BubbleViewDestroyed() {
   if (message_center_bubble())
     message_center_bubble()->bubble()->BubbleViewDestroyed();
   if (popup_bubble())
     popup_bubble()->bubble()->BubbleViewDestroyed();
 }
 
 void WebNotificationTray::OnMouseEnteredView() {
   if (popup_bubble())
     popup_bubble()->bubble()->OnMouseEnteredView();
 }
 
 void WebNotificationTray::OnMouseExitedView() {
   if (popup_bubble())
     popup_bubble()->bubble()->OnMouseExitedView();
 }
 
 string16 WebNotificationTray::GetAccessibleNameForBubble() {
   return GetAccessibleNameForTray();
 }
 
-gfx::Rect WebNotificationTray::GetAnchorRect(views::Widget* anchor_widget,
-                                             AnchorType anchor_type,
-                                             AnchorAlignment anchor_alignment) {
+gfx::Rect WebNotificationTray::GetAnchorRect(

[Pete Williamson, 2013/01/23 19:52:16]

This function could use a better name, and possibly a better idiom.  We don't
really care about the rect, we really care about where to put the point of our
speech bubble, and the orientation.  Perhaps GetBubbleAnchorPoint?  It could
return LEFT, RIGHT, TOP, or BOTTOM in an outparam

[dewittj, 2013/01/23 22:07:51]

As described elsewhere, sometimes the edge of the rectangle is used for
alignment purposes.  Its name is from TrayBubbleView::Delegate interface, which
I'm not changing here.

+    views::Widget* anchor_widget,
+    views::TrayBubbleView::AnchorType anchor_type,
+    views::TrayBubbleView::AnchorAlignment anchor_alignment) {
   return GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment);
 }
 
 void WebNotificationTray::HideBubble(const views::TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 

[Pete Williamson, 2013/01/23 19:52:16]

Note to self - this moved, compare it with the new version in message center
tray

[dewittj, 2013/01/23 22:07:51]

Noted.

[Pete Williamson, 2013/01/24 19:41:59]

OK, I compared the two implementations as part of my review, no problems found.

-void WebNotificationTray::OnMessageCenterChanged(bool new_notification) {
-  if (message_center_bubble()) {
-    if (message_center_->NotificationCount() == 0)
-      HideMessageCenterBubble();
-    else
-      message_center_bubble()->bubble()->ScheduleUpdate();
-  }
-  if (popup_bubble()) {
-    if (message_center_->NotificationCount() == 0)
-      HidePopupBubble();
-    else
-      popup_bubble()->bubble()->ScheduleUpdate();
-  }
-  UpdateTray();
-  if (new_notification)
-    ShowPopupBubble();
-}
-
 void WebNotificationTray::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   DCHECK_EQ(button_, sender);
   PerformAction(event);
 }
 
 void WebNotificationTray::OnWidgetClosing(views::Widget* widget) {
   if (quiet_mode_bubble() && quiet_mode_bubble_->GetBubbleWidget() == widget) {
     widget->RemoveObserver(this);
   }
   quiet_mode_bubble_.reset();
 }
 
-// Private methods
-
-void WebNotificationTray::ToggleMessageCenterBubble() {
-  if (message_center_bubble())
-    HideMessageCenterBubble();
-  else
-    ShowMessageCenterBubble();
-  UpdateTray();
-}
-
-void WebNotificationTray::UpdateTray() {
+void WebNotificationTray::OnMessageCenterTrayChanged() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  if (message_center_->UnreadNotificationCount() > 0) {
+  message_center::MessageCenter* message_center =
+      message_center_tray_->message_center();
+  if (message_center->UnreadNotificationCount() > 0) {
     button_->SetImage(views::CustomButton::STATE_NORMAL, rb.GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_NORMAL));
     button_->SetImage(views::CustomButton::STATE_HOVERED, rb.GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_HOVER));
     button_->SetImage(views::CustomButton::STATE_PRESSED, rb.GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_PRESSED));
   } else {
     button_->SetImage(views::CustomButton::STATE_NORMAL, rb.GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_NORMAL));
     button_->SetImage(views::CustomButton::STATE_HOVERED, rb.GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_HOVER));
     button_->SetImage(views::CustomButton::STATE_PRESSED, rb.GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_PRESSED));
   }
-  if (message_center_bubble())
+  if (IsMessageCenterBubbleVisible())
     button_->SetState(views::CustomButton::STATE_PRESSED);
   else
     button_->SetState(views::CustomButton::STATE_NORMAL);
   Layout();
   SchedulePaint();
 }
 
 bool WebNotificationTray::ClickedOutsideBubble() {
   // Only hide the message center and quiet mode bubble.
   if (!message_center_bubble() && !quiet_mode_bubble())
     return false;
   quiet_mode_bubble_.reset();
-  HideMessageCenterBubble();
+  message_center_tray_->HideMessageCenterBubble();
   return true;
 }
 
+message_center::MessageCenter* WebNotificationTray::message_center() {
+  return message_center_tray_->message_center();
+}
+
 // Methods for testing
 
+bool WebNotificationTray::IsPopupVisible() const {
+  return message_center_tray_->IsPopupVisible();
+}
+
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble_.get())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble_->bubble());
 }
 
 message_center::MessagePopupBubble*
 WebNotificationTray::GetPopupBubbleForTest() {
   if (!popup_bubble_.get())
     return NULL;
   return static_cast<message_center::MessagePopupBubble*>(
       popup_bubble_->bubble());
 }
 
 }  // namespace ash