Add WebNotificationTray to the status area

ash/system/status_area_widget.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/status_area_widget.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/network/network_observer.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/web_notification/web_notification_tray.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
 namespace {
 
 class DummySystemTrayDelegate : public SystemTrayDelegate {
  public:
@@ skipping 249 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
 };
 
 }  // namespace
 
 namespace internal {
 
 StatusAreaWidget::StatusAreaWidget()
     : widget_delegate_(new internal::StatusAreaWidgetDelegate),
-      system_tray_(NULL) {
+      system_tray_(NULL),
+      web_notification_tray_(NULL) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = widget_delegate_;
   params.parent = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(),
       ash::internal::kShellWindowId_StatusContainer);
   params.transparent = true;
   Init(params);
   set_focus_on_creation(false);
   SetContentsView(widget_delegate_);
   GetNativeView()->SetName("StatusAreaWidget");
 }
 
 StatusAreaWidget::~StatusAreaWidget() {
 }
 
 void StatusAreaWidget::CreateTrayViews(ShellDelegate* shell_delegate) {
+  AddWebNotificationTray(new WebNotificationTray(this));
   AddSystemTray(new SystemTray(), shell_delegate);
 }
 
 void StatusAreaWidget::Shutdown() {
   // Destroy the trays early, causing them to be removed from the view
   // hierarchy. Do not used scoped pointers since we don't want to destroy them
   // in the destructor if Shutdown() is not called (e.g. in tests).
   delete system_tray_;
   system_tray_ = NULL;
+  delete web_notification_tray_;
+  web_notification_tray_ = NULL;
 }
 
 void StatusAreaWidget::AddSystemTray(SystemTray* system_tray,
                                      ShellDelegate* shell_delegate) {
   system_tray_ = system_tray;
   widget_delegate_->AddTray(system_tray);
   system_tray_->Initialize();  // Called after added to widget.
 
   if (shell_delegate) {
     system_tray_delegate_.reset(
         shell_delegate->CreateSystemTrayDelegate(system_tray));
   }
   if (!system_tray_delegate_.get())
     system_tray_delegate_.reset(new DummySystemTrayDelegate());
 
   system_tray->CreateItems();  // Called after delegate is created.
 }
 
+void StatusAreaWidget::AddWebNotificationTray(
+    WebNotificationTray* web_notification_tray) {
+  web_notification_tray_ = web_notification_tray;
+  widget_delegate_->AddTray(web_notification_tray);
+}
+
 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
   widget_delegate_->set_alignment(alignment);
   widget_delegate_->UpdateLayout();
+  if (system_tray_)
+    system_tray_->SetShelfAlignment(alignment);
+  if (web_notification_tray_)
+    web_notification_tray_->SetShelfAlignment(alignment);
+}
+
+void StatusAreaWidget::SetPaintsBackground(
+      bool value,

[sadrul, 2012/06/13 16:37:56]

less indentation

[stevenjb, 2012/06/13 19:05:02]

Done.

+      internal::BackgroundAnimator::ChangeType change_type) {
+  if (system_tray_)
+    system_tray_->SetPaintsBackground(value, change_type);
+  if (web_notification_tray_)
+    web_notification_tray_->SetPaintsBackground(value, change_type);
+}
+
+void StatusAreaWidget::ShowWebNotificationBubble(UserAction user_action) {
+  // If not triggered by a user action, only show the web notification bubble
+  // if the system tray is not visible.
+  if (user_action == USER_ACTION &&
+      system_tray_ && system_tray_->IsBubbleVisible()) {
+    return;
+  }
+  DCHECK(web_notification_tray_);
+  web_notification_tray_->ShowBubble();
+  // Disable showing system notifications while viewing web notifications.
+  if (system_tray_)
+    system_tray_->SetHideNotifications(true);

[sadrul, 2012/06/13 16:37:56]

Just to clarify: with this change, both the system-tray bubble and the
web-notification bubbles can be visible at the same time?

[stevenjb, 2012/06/13 19:05:02]

No, only one should be visible at a time, but that's not very clear from the
logic, and the logic actually has a flaw. As written it should be 'if
(user_action != USER_ACTION' above. A user action will always close the system
tray bubble, but we should make that explicit here. I will change the logic.

+}
+
+void StatusAreaWidget::HideWebNotificationBubble() {
+  DCHECK(web_notification_tray_);
+  web_notification_tray_->HideBubble();
+  // Show any hidden or suppressed system notifications.
+  if (system_tray_)
+    system_tray_->SetHideNotifications(false);
 }
 
 }  // namespace internal
 }  // namespace ash