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

ash/system/web_notification/web_notification_tray_unittest.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 <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
+#include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/test_system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
@@ skipping 25 matching lines @@
     }
   }
 
   return NULL;
 }
 
 message_center::MessageCenter* GetMessageCenter() {
   return GetTray()->message_center();
 }
 
+SystemTray* GetSystemTray() {
+  return Shell::GetPrimaryRootWindowController()->shelf()->
+      status_area_widget()->system_tray();
+}
+
+// Trivial item implementation for testing PopupAndSystemTray test case.
+class TestItem : public SystemTrayItem {
+ public:
+  TestItem() : SystemTrayItem(GetSystemTray()) {}
+
+  virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE {
+    views::View* default_view = new views::View;
+    default_view->SetLayoutManager(new views::FillLayout);
+    default_view->AddChildView(new views::Label(UTF8ToUTF16("Default")));
+    return default_view;
+  }
+
+  virtual views::View* CreateNotificationView(
+      user::LoginStatus status) OVERRIDE {
+    return new views::View;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestItem);
+};
+
+}  // namespace
+
 class WebNotificationTrayTest : public test::AshTestBase {
  public:
   WebNotificationTrayTest() {}
   virtual ~WebNotificationTrayTest() {}
 
   virtual void TearDown() OVERRIDE {
     GetMessageCenter()->RemoveAllNotifications(false);
     test::AshTestBase::TearDown();
   }
 
@@ skipping 30 matching lines @@
   }
 
   void RemoveNotification(const std::string& id) {
     GetMessageCenter()->RemoveNotification(id, false);
   }
 
   views::Widget* GetWidget() {
     return GetTray()->GetWidget();
   }
 
+  gfx::Rect GetPopupWorkArea() {
+    return GetPopupWorkAreaForTray(GetTray());
+  }
+
+  gfx::Rect GetPopupWorkAreaForTray(WebNotificationTray* tray) {
+    return tray->popup_collection_->work_area_;
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayTest);
 };
 
-}  // namespace
-
 TEST_F(WebNotificationTrayTest, WebNotifications) {
   // TODO(mukai): move this test case to ui/message_center.
   ASSERT_TRUE(GetWidget());
 
   // Add a notification.
   AddNotification("test_id1");
   EXPECT_EQ(1u, GetMessageCenter()->NotificationCount());
   EXPECT_TRUE(GetMessageCenter()->HasNotification("test_id1"));
   AddNotification("test_id2");
   AddNotification("test_id2");
@@ skipping 64 matching lines @@
 
 // Flakily times out. http://crbug.com/229792
 TEST_F(WebNotificationTrayTest, DISABLED_ManyPopupNotifications) {
   // Add the max visible popup notifications +1, ensure the correct num visible.
   size_t notifications_to_add =
       message_center::kMaxVisiblePopupNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = base::StringPrintf("test_id%d", static_cast<int>(i));
     AddNotification(id);
   }
-  // Hide and reshow the bubble so that it is updated immediately, not delayed.
-  GetTray()->SetHidePopupBubble(true);
-  GetTray()->SetHidePopupBubble(false);
+  GetTray()->ShowPopups();
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   EXPECT_EQ(notifications_to_add,
             GetMessageCenter()->NotificationCount());
   NotificationList::PopupNotifications popups =
       GetMessageCenter()->GetPopupNotifications();
   EXPECT_EQ(message_center::kMaxVisiblePopupNotifications, popups.size());
 }
 
 #if defined(OS_CHROMEOS)
 // Display notification is ChromeOS only.
 #define MAYBE_PopupShownOnBothDisplays PopupShownOnBothDisplays
+#define MAYBE_PopupAndSystemTrayMultiDisplay PopupAndSystemTrayMultiDisplay
 #else
 #define MAYBE_PopupShownOnBothDisplays DISABLED_PopupShownOnBothDisplays
+#define MAYBE_PopupAndSystemTrayMultiDisplay \
+  DISABLED_PopupAndSystemTrayMultiDisplay
 #endif
 
 // Verifies if the notification appears on both displays when extended mode.
 TEST_F(WebNotificationTrayTest, MAYBE_PopupShownOnBothDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Enables to appear the notification for display changes.
   test::TestSystemTrayDelegate* tray_delegate =
       static_cast<test::TestSystemTrayDelegate*>(
@@ skipping 20 matching lines @@
   EXPECT_FALSE(GetSecondaryTray());
 
   display_manager->SetSoftwareMirroring(false);
   UpdateDisplay("400x400,200x200");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   secondary_tray = GetSecondaryTray();
   ASSERT_TRUE(secondary_tray);
   EXPECT_TRUE(secondary_tray->IsPopupVisible());
 }
 
+#if defined(OS_CHROMEOS)
+// PopupAndSystemTray may fail in platforms other than ChromeOS because the
+// RootWindow's bound can be bigger than gfx::Display's work area so that
+// openingsystem tray doesn't affect at all the work area of popups.
+#define MAYBE_PopupAndSystemTray PopupAndSystemTray
+#else
+#define MAYBE_PopupAndSystemTray DISABLED_PopupAndSystemTray
+#endif
+
+TEST_F(WebNotificationTrayTest, MAYBE_PopupAndSystemTray) {
+  TestItem* test_item = new TestItem;
+  GetSystemTray()->AddTrayItem(test_item);
+
+  AddNotification("test_id");
+  EXPECT_TRUE(GetTray()->IsPopupVisible());
+  gfx::Rect work_area = GetPopupWorkArea();
+
+  // System tray is created, the popup's work area should be narrowed but still
+  // visible.
+  GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
+  EXPECT_TRUE(GetTray()->IsPopupVisible());
+  gfx::Rect work_area_with_tray = GetPopupWorkArea();
+  EXPECT_GT(work_area.size().GetArea(), work_area_with_tray.size().GetArea());
+
+  // System tray notification is also created, the popup's work area is narrowed
+  // even more, but still visible.
+  GetSystemTray()->ShowNotificationView(test_item);
+  EXPECT_TRUE(GetTray()->IsPopupVisible());
+  gfx::Rect work_area_with_tray_notificaiton = GetPopupWorkArea();
+  EXPECT_GT(work_area.size().GetArea(),
+            work_area_with_tray_notificaiton.size().GetArea());
+  EXPECT_GT(work_area_with_tray.size().GetArea(),
+            work_area_with_tray_notificaiton.size().GetArea());
+
+  // Close system tray, only system tray notifications.
+  GetSystemTray()->ClickedOutsideBubble();
+  EXPECT_TRUE(GetTray()->IsPopupVisible());
+  gfx::Rect work_area_with_notification = GetPopupWorkArea();
+  EXPECT_GT(work_area.size().GetArea(),
+            work_area_with_notification.size().GetArea());
+  EXPECT_LT(work_area_with_tray_notificaiton.size().GetArea(),
+            work_area_with_notification.size().GetArea());
+
+  // Close the notifications.
+  GetSystemTray()->HideNotificationView(test_item);
+  EXPECT_TRUE(GetTray()->IsPopupVisible());
+  EXPECT_EQ(work_area.ToString(), GetPopupWorkArea().ToString());
+}
+
+TEST_F(WebNotificationTrayTest, PopupAndSystemTrayAlignment) {
+  Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
+      SetAlignment(SHELF_ALIGNMENT_LEFT);
+  AddNotification("test_id");
+  gfx::Rect work_area = GetPopupWorkArea();
+
+  // System tray is created, but the work area is not affected since the tray
+  // appears at the left-bottom while the popups appear at the right bottom.
+  GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
+  EXPECT_EQ(work_area.ToString(), GetPopupWorkArea().ToString());
+}
+
+TEST_F(WebNotificationTrayTest, MAYBE_PopupAndSystemTrayMultiDisplay) {
+  UpdateDisplay("800x600,600x400");
+
+  AddNotification("test_id");
+  gfx::Rect work_area = GetPopupWorkArea();
+  gfx::Rect work_area_second = GetPopupWorkAreaForTray(GetSecondaryTray());
+
+  // System tray is created on the primary display. The popups in the secondary
+  // tray aren't affected.
+  GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
+  EXPECT_GT(work_area.size().GetArea(), GetPopupWorkArea().size().GetArea());
+  EXPECT_EQ(work_area_second.ToString(),
+            GetPopupWorkAreaForTray(GetSecondaryTray()).ToString());
+}
+
 }  // namespace ash