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/window_state.h" |
10 #include "ash/display/display_manager.h" | 11 #include "ash/display/display_manager.h" |
11 #include "ash/root_window_controller.h" | 12 #include "ash/root_window_controller.h" |
12 #include "ash/shelf/shelf_layout_manager.h" | 13 #include "ash/shelf/shelf_layout_manager.h" |
13 #include "ash/shelf/shelf_widget.h" | 14 #include "ash/shelf/shelf_widget.h" |
14 #include "ash/shell.h" | 15 #include "ash/shell.h" |
15 #include "ash/system/status_area_widget.h" | 16 #include "ash/system/status_area_widget.h" |
16 #include "ash/system/tray/system_tray.h" | 17 #include "ash/system/tray/system_tray.h" |
17 #include "ash/system/tray/system_tray_item.h" | 18 #include "ash/system/tray/system_tray_item.h" |
18 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" | 19 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" |
19 #include "ash/test/ash_test_base.h" | 20 #include "ash/test/ash_test_base.h" |
20 #include "ash/test/status_area_widget_test_helper.h" | 21 #include "ash/test/status_area_widget_test_helper.h" |
21 #include "ash/test/test_system_tray_delegate.h" | 22 #include "ash/test/test_system_tray_delegate.h" |
22 #include "ash/wm/common/window_state.h" | |
23 #include "ash/wm/window_state_aura.h" | 23 #include "ash/wm/window_state_aura.h" |
24 #include "base/strings/stringprintf.h" | 24 #include "base/strings/stringprintf.h" |
25 #include "base/strings/utf_string_conversions.h" | 25 #include "base/strings/utf_string_conversions.h" |
26 #include "ui/aura/client/aura_constants.h" | 26 #include "ui/aura/client/aura_constants.h" |
27 #include "ui/aura/window.h" | 27 #include "ui/aura/window.h" |
28 #include "ui/display/display.h" | 28 #include "ui/display/display.h" |
29 #include "ui/display/screen.h" | 29 #include "ui/display/screen.h" |
30 #include "ui/events/event.h" | 30 #include "ui/events/event.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" |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
524 ui::TouchEvent release(ui::ET_TOUCH_RELEASED, out_of_bounds, touch_id, | 524 ui::TouchEvent release(ui::ET_TOUCH_RELEASED, out_of_bounds, touch_id, |
525 move.time_stamp()+base::TimeDelta::FromMilliseconds(50)); | 525 move.time_stamp()+base::TimeDelta::FromMilliseconds(50)); |
526 generator.Dispatch(&release); | 526 generator.Dispatch(&release); |
527 EXPECT_FALSE(tray->draw_background_as_active()); | 527 EXPECT_FALSE(tray->draw_background_as_active()); |
528 EXPECT_FALSE(tray->IsMessageCenterBubbleVisible()); | 528 EXPECT_FALSE(tray->IsMessageCenterBubbleVisible()); |
529 } | 529 } |
530 | 530 |
531 #endif // OS_CHROMEOS | 531 #endif // OS_CHROMEOS |
532 | 532 |
533 } // namespace ash | 533 } // namespace ash |
OLD | NEW |