ash/system/web_notification/web_notification_tray_unittest.cc - Issue 802473003: Fix references to ui/gfx headers in a*/.

Side by Side Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 802473003: Fix references to ui/gfx headers in a*/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « ash/system/user/user_card_view.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

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 <vector>	7 #include <vector>

8	8

9 #include "ash/display/display_manager.h"	9 #include "ash/display/display_manager.h"

10 #include "ash/root_window_controller.h"	10 #include "ash/root_window_controller.h"

11 #include "ash/shelf/shelf_layout_manager.h"	11 #include "ash/shelf/shelf_layout_manager.h"

12 #include "ash/shelf/shelf_widget.h"	12 #include "ash/shelf/shelf_widget.h"

13 #include "ash/shell.h"	13 #include "ash/shell.h"

14 #include "ash/system/status_area_widget.h"	14 #include "ash/system/status_area_widget.h"

15 #include "ash/system/tray/system_tray.h"	15 #include "ash/system/tray/system_tray.h"

16 #include "ash/system/tray/system_tray_item.h"	16 #include "ash/system/tray/system_tray_item.h"

17 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"	17 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"

18 #include "ash/test/ash_test_base.h"	18 #include "ash/test/ash_test_base.h"

19 #include "ash/test/status_area_widget_test_helper.h"	19 #include "ash/test/status_area_widget_test_helper.h"

20 #include "ash/test/test_system_tray_delegate.h"	20 #include "ash/test/test_system_tray_delegate.h"

21 #include "ash/wm/window_state.h"	21 #include "ash/wm/window_state.h"

22 #include "base/strings/stringprintf.h"	22 #include "base/strings/stringprintf.h"

23 #include "base/strings/utf_string_conversions.h"	23 #include "base/strings/utf_string_conversions.h"

24 #include "ui/aura/client/aura_constants.h"	24 #include "ui/aura/client/aura_constants.h"

25 #include "ui/aura/window.h"	25 #include "ui/aura/window.h"

26 #include "ui/events/event.h"	26 #include "ui/events/event.h"

27 #include "ui/events/test/event_generator.h"	27 #include "ui/events/test/event_generator.h"

28 #include "ui/gfx/display.h"	28 #include "ui/gfx/display.h"

29 #include "ui/gfx/point.h"	29 #include "ui/gfx/geometry/point.h"

30 #include "ui/gfx/rect.h"	30 #include "ui/gfx/geometry/rect.h"

31 #include "ui/gfx/screen.h"	31 #include "ui/gfx/screen.h"

32 #include "ui/message_center/message_center_style.h"	32 #include "ui/message_center/message_center_style.h"

33 #include "ui/message_center/message_center_tray.h"	33 #include "ui/message_center/message_center_tray.h"

34 #include "ui/message_center/notification_list.h"	34 #include "ui/message_center/notification_list.h"

35 #include "ui/message_center/notification_types.h"	35 #include "ui/message_center/notification_types.h"

36 #include "ui/message_center/views/message_center_bubble.h"	36 #include "ui/message_center/views/message_center_bubble.h"

37 #include "ui/message_center/views/message_popup_collection.h"	37 #include "ui/message_center/views/message_popup_collection.h"

38 #include "ui/views/controls/label.h"	38 #include "ui/views/controls/label.h"

39 #include "ui/views/layout/fill_layout.h"	39 #include "ui/views/layout/fill_layout.h"

40 #include "ui/views/view.h"	40 #include "ui/views/view.h"

(...skipping 496 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
537 move.time_stamp()+base::TimeDelta::FromMilliseconds(50));	537 move.time_stamp()+base::TimeDelta::FromMilliseconds(50));

538 generator.Dispatch(&release);	538 generator.Dispatch(&release);

539 RunAllPendingInMessageLoop();	539 RunAllPendingInMessageLoop();

540 EXPECT_FALSE(tray->draw_background_as_active());	540 EXPECT_FALSE(tray->draw_background_as_active());

541 EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());	541 EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());

542 }	542 }

543	543

544 #endif // OS_CHROMEOS	544 #endif // OS_CHROMEOS

545	545

546 } // namespace ash	546 } // namespace ash

OLD	NEW