Do not hide the web notification popups by the system tray, rather let them avoid (2nd)

ash/system/tray/system_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/tray/system_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/tray_bluetooth.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/date/tray_date.h"
 #include "ash/system/drive/tray_drive.h"
 #include "ash/system/ime/tray_ime.h"
 #include "ash/system/logout_button/tray_logout_button.h"
 #include "ash/system/monitor/tray_monitor.h"
 #include "ash/system/session_length_limit/tray_session_length_limit.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/tray_update.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/user/tray_user.h"
+#include "ash/system/web_notification/web_notification_tray.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
@@ skipping 326 matching lines @@
 // Private methods.
 
 bool SystemTray::HasSystemBubbleType(SystemTrayBubble::BubbleType type) {
   DCHECK(type != SystemTrayBubble::BUBBLE_TYPE_NOTIFICATION);
   return system_bubble_.get() && system_bubble_->bubble_type() == type;
 }
 
 void SystemTray::DestroySystemBubble() {
   system_bubble_.reset();
   detailed_item_ = NULL;
+  UpdateWebNotifications();
 }
 
 void SystemTray::DestroyNotificationBubble() {
   if (notification_bubble_) {
     notification_bubble_.reset();
-    status_area_widget()->SetHideWebNotifications(false);
+    UpdateWebNotifications();
   }
 }
 
 int SystemTray::GetTrayXOffset(SystemTrayItem* item) const {
   // Don't attempt to align the arrow if the shelf is on the left or right.
   if (shelf_alignment() != SHELF_ALIGNMENT_BOTTOM &&
       shelf_alignment() != SHELF_ALIGNMENT_TOP)
     return TrayBubbleView::InitParams::kArrowDefaultOffset;
 
   std::map<SystemTrayItem*, views::View*>::const_iterator it =
@@ skipping 78 matching lines @@
   // Save height of default view for creating detailed views directly.
   if (!detailed)
     default_bubble_height_ = system_bubble_->bubble_view()->height();
 
   if (detailed && items.size() > 0)
     detailed_item_ = items[0];
   else
     detailed_item_ = NULL;
 
   UpdateNotificationBubble();  // State changed, re-create notifications.
-  status_area_widget()->SetHideWebNotifications(true);
+  if (!notification_bubble_)
+    UpdateWebNotifications();
   GetShelfLayoutManager()->UpdateAutoHideState();
 }
 
 void SystemTray::UpdateNotificationBubble() {
   // Only show the notification bubble if we have notifications.
   if (notification_items_.empty()) {
     DestroyNotificationBubble();
     return;
   }
   // Destroy the existing bubble before constructing a new one.
@@ skipping 29 matching lines @@
   notification_bubble_->InitView(this, anchor, &init_params);
 
   if (notification_bubble->bubble_view()->child_count() == 0) {
     // It is possible that none of the items generated actual notifications.
     DestroyNotificationBubble();
     return;
   }
   if (hide_notifications_)
     notification_bubble->SetVisible(false);
   else
-    status_area_widget()->SetHideWebNotifications(true);
+    UpdateWebNotifications();
+}
+
+void SystemTray::UpdateWebNotifications() {
+  TrayBubbleView* bubble_view = NULL;
+  if (notification_bubble_)
+    bubble_view = notification_bubble_->bubble_view();
+  else if (system_bubble_)
+    bubble_view = system_bubble_->bubble_view();
+
+  int height = 0;
+  if (bubble_view) {
+    gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(
+        bubble_view->GetWidget()->GetNativeView()).work_area();
+    if (GetShelfLayoutManager()->GetAlignment() != SHELF_ALIGNMENT_TOP) {
+      height = std::max(
+          0, work_area.height() - bubble_view->GetBoundsInScreen().y());
+    } else {
+      height = std::max(
+          0, bubble_view->GetBoundsInScreen().bottom() - work_area.y());
+    }
+  }
+  status_area_widget()->web_notification_tray()->SetSystemTrayHeight(height);
 }
 
 void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
   UpdateAfterShelfAlignmentChange(alignment);
   // Destroy any existing bubble so that it is rebuilt correctly.
   system_bubble_.reset();
   // Rebuild any notification bubble.
@@ skipping 86 matching lines @@
         ConvertPointToWidget(this, &point);
         arrow_offset = point.x();
       }
     }
     ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
   }
   return true;
 }
 
 }  // namespace ash