| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/web_notification/web_notification_tray.h" | 5 #include "ash/system/web_notification/web_notification_tray.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/wm_shell.h" | |
| 11 #include "ash/common/wm_window.h" | |
| 12 #include "ash/public/cpp/shell_window_ids.h" | 10 #include "ash/public/cpp/shell_window_ids.h" |
| 13 #include "ash/shelf/shelf_layout_manager.h" | 11 #include "ash/shelf/shelf_layout_manager.h" |
| 14 #include "ash/shelf/wm_shelf.h" | 12 #include "ash/shelf/wm_shelf.h" |
| 15 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 16 #include "ash/system/screen_layout_observer.h" | 14 #include "ash/system/screen_layout_observer.h" |
| 17 #include "ash/system/status_area_widget.h" | 15 #include "ash/system/status_area_widget.h" |
| 18 #include "ash/system/tray/system_tray.h" | 16 #include "ash/system/tray/system_tray.h" |
| 19 #include "ash/system/tray/system_tray_item.h" | 17 #include "ash/system/tray/system_tray_item.h" |
| 20 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" | 18 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" |
| 21 #include "ash/test/ash_test_base.h" | 19 #include "ash/test/ash_test_base.h" |
| 22 #include "ash/test/status_area_widget_test_helper.h" | 20 #include "ash/test/status_area_widget_test_helper.h" |
| 23 #include "ash/test/test_system_tray_delegate.h" | 21 #include "ash/test/test_system_tray_delegate.h" |
| 24 #include "ash/wm/window_state.h" | 22 #include "ash/wm/window_state.h" |
| 23 #include "ash/wm_shell.h" |
| 24 #include "ash/wm_window.h" |
| 25 #include "base/memory/ptr_util.h" | 25 #include "base/memory/ptr_util.h" |
| 26 #include "base/strings/stringprintf.h" | 26 #include "base/strings/stringprintf.h" |
| 27 #include "base/strings/utf_string_conversions.h" | 27 #include "base/strings/utf_string_conversions.h" |
| 28 #include "ui/display/display.h" | 28 #include "ui/display/display.h" |
| 29 #include "ui/display/manager/display_manager.h" | 29 #include "ui/display/manager/display_manager.h" |
| 30 #include "ui/display/screen.h" | 30 #include "ui/display/screen.h" |
| 31 #include "ui/events/test/event_generator.h" | 31 #include "ui/events/test/event_generator.h" |
| 32 #include "ui/gfx/geometry/point.h" | 32 #include "ui/gfx/geometry/point.h" |
| 33 #include "ui/gfx/geometry/rect.h" | 33 #include "ui/gfx/geometry/rect.h" |
| 34 #include "ui/message_center/message_center_style.h" | 34 #include "ui/message_center/message_center_style.h" |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 int bottom_second = GetPopupWorkAreaBottomForTray(GetSecondaryTray()); | 390 int bottom_second = GetPopupWorkAreaBottomForTray(GetSecondaryTray()); |
| 391 | 391 |
| 392 // System tray is created on the primary display. The popups in the secondary | 392 // System tray is created on the primary display. The popups in the secondary |
| 393 // tray aren't affected. | 393 // tray aren't affected. |
| 394 GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW); | 394 GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW); |
| 395 EXPECT_GT(bottom, GetPopupWorkAreaBottom()); | 395 EXPECT_GT(bottom, GetPopupWorkAreaBottom()); |
| 396 EXPECT_EQ(bottom_second, GetPopupWorkAreaBottomForTray(GetSecondaryTray())); | 396 EXPECT_EQ(bottom_second, GetPopupWorkAreaBottomForTray(GetSecondaryTray())); |
| 397 } | 397 } |
| 398 | 398 |
| 399 } // namespace ash | 399 } // namespace ash |
| OLD | NEW |