Change Ash web notification behavior

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/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 280 matching lines @@
   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);
+  AddSystemTray(new SystemTray(this), 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;
@@ skipping 32 matching lines @@
 
 void StatusAreaWidget::SetPaintsBackground(
     bool value,
     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 (system_tray_ && system_tray_->IsBubbleVisible()) {
-    // User actions should always hide the system tray bubble first.
-    DCHECK(user_action != USER_ACTION);
-    // Don't immediately show the web notification bubble if the system tray
-    // bubble is visible.
-    return;
-  }
-  DCHECK(web_notification_tray_);
-  web_notification_tray_->ShowBubble();
-  // Disable showing system notifications while viewing web notifications.
-  if (system_tray_)
-    system_tray_->SetHideNotifications(true);
+void StatusAreaWidget::HideNonSystemNotifications() {
+  if (web_notification_tray_)
+    web_notification_tray_->HideNotificationBubble();
 }
 
-void StatusAreaWidget::HideWebNotificationBubble() {
-  DCHECK(web_notification_tray_);
-  web_notification_tray_->HideBubble();
-  // Show any hidden or suppressed system notifications.
+void StatusAreaWidget::SetHideSystemNotifications(bool hide) {
   if (system_tray_)
-    system_tray_->SetHideNotifications(false);
+    system_tray_->SetHideNotifications(hide);
+}
+
+bool StatusAreaWidget::ShouldShowNonSystemNotifications() {
+  return !(system_tray_ && system_tray_->IsAnyBubbleVisible());
 }
 
 void StatusAreaWidget::UpdateAfterLoginStatusChange(
     user::LoginStatus login_status) {
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace internal
 }  // namespace ash