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

ash/system/web_notification/web_notification_tray.h

 // 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.
 
 #ifndef ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
 #define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
 
 #include "ash/ash_export.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/user/login_status.h"
@@ skipping 37 matching lines @@
     : public internal::TrayBackgroundView,
       public views::TrayBubbleView::Delegate,
       public message_center::MessageCenterTrayDelegate,
       public views::ButtonListener,
       public base::SupportsWeakPtr<WebNotificationTray> {
  public:
   explicit WebNotificationTray(
       internal::StatusAreaWidget* status_area_widget);
   virtual ~WebNotificationTray();
 
-  // Set whether or not the popup notifications should be hidden.
-  void SetHidePopupBubble(bool hide);
+  // Sets the height of the system tray from the edge of the work area so that
+  // the notification popups don't overlap with the tray. Passes 0 if no UI is
+  // shown in the system tray side.
+  void SetSystemTrayHeight(int height);
 
   // Updates tray visibility login status of the system changes.
   void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
 
   // Returns true if it should block the auto hide behavior of the launcher.
   bool ShouldBlockLauncherAutoHide() const;
 
   // Returns true if the message center bubble is visible.
   bool IsMessageCenterBubbleVisible() const;
 
@@ skipping 35 matching lines @@
   virtual bool ShowPopups() OVERRIDE;
   virtual void HidePopups() OVERRIDE;
   virtual bool ShowNotifierSettings() OVERRIDE;
 
   // Overridden from TrayBackgroundView.
   virtual bool IsPressed() OVERRIDE;
 
   message_center::MessageCenter* message_center();
 
  private:
+  friend class WebNotificationTrayTest;
+
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications);
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble);
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest,
                            ManyMessageCenterNotifications);
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications);
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, PopupShownOnBothDisplays);
+  FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, PopupAndSystemTray);
 
   void UpdateTrayContent();
 
   // The actual process to show the message center. Set |show_settings| to true
   // if the message center should be initialized with the settings visible.
   // Returns true if the center is successfully created.
   bool ShowMessageCenterInternal(bool show_settings);
 
   // Queries login status and the status area widget to determine visibility of
   // the message center.
@@ skipping 31 matching lines @@
 
   // Observes the work area for |popup_collection_| and notifies to it.
   scoped_ptr<internal::WorkAreaObserver> work_area_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_