ash/mus/accelerators/accelerator_controller_unittest.cc - Issue 2620153003: Folds WmRootWindowController into RootWindowController

Side by Side Diff: ash/mus/accelerators/accelerator_controller_unittest.cc

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: merge Created 3 years, 11 months ago

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

Jump to:

« no previous file with comments | « ash/common/wm_window.h ('k') | ash/mus/bridge/wm_lookup_mus.h » ('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/common/accelerators/accelerator_controller.h"	5 #include "ash/common/accelerators/accelerator_controller.h"

6	6

7 #include "ash/common/accelerators/accelerator_table.h"	7 #include "ash/common/accelerators/accelerator_table.h"

8 #include "ash/common/accessibility_delegate.h"	8 #include "ash/common/accessibility_delegate.h"

9 #include "ash/common/accessibility_types.h"	9 #include "ash/common/accessibility_types.h"

10 #include "ash/common/ash_switches.h"	10 #include "ash/common/ash_switches.h"

11 #include "ash/common/ime_control_delegate.h"	11 #include "ash/common/ime_control_delegate.h"

12 #include "ash/common/session/session_state_delegate.h"	12 #include "ash/common/session/session_state_delegate.h"

13 #include "ash/common/system/brightness_control_delegate.h"	13 #include "ash/common/system/brightness_control_delegate.h"

14 #include "ash/common/system/keyboard_brightness_control_delegate.h"	14 #include "ash/common/system/keyboard_brightness_control_delegate.h"

15 #include "ash/common/system/tray/system_tray_delegate.h"	15 #include "ash/common/system/tray/system_tray_delegate.h"

16 #include "ash/common/test/ash_test.h"	16 #include "ash/common/test/ash_test.h"

17 #include "ash/common/wm/panels/panel_layout_manager.h"	17 #include "ash/common/wm/panels/panel_layout_manager.h"

18 #include "ash/common/wm/window_positioning_utils.h"	18 #include "ash/common/wm/window_positioning_utils.h"

19 #include "ash/common/wm/window_state.h"	19 #include "ash/common/wm/window_state.h"

20 #include "ash/common/wm/wm_event.h"	20 #include "ash/common/wm/wm_event.h"

21 #include "ash/common/wm_lookup.h"	21 #include "ash/common/wm_lookup.h"

22 #include "ash/common/wm_root_window_controller.h"

23 #include "ash/common/wm_shell.h"	22 #include "ash/common/wm_shell.h"

24 #include "ash/mus/accelerators/accelerator_controller_registrar_test_api.h"	23 #include "ash/mus/accelerators/accelerator_controller_registrar_test_api.h"

25 #include "ash/mus/bridge/wm_shell_mus_test_api.h"	24 #include "ash/mus/bridge/wm_shell_mus_test_api.h"

26 #include "ash/mus/bridge/wm_window_mus.h"	25 #include "ash/mus/bridge/wm_window_mus.h"

27 #include "ash/mus/property_util.h"	26 #include "ash/mus/property_util.h"

28 #include "ash/mus/test/wm_test_base.h"	27 #include "ash/mus/test/wm_test_base.h"

29 #include "ash/public/cpp/shell_window_ids.h"	28 #include "ash/public/cpp/shell_window_ids.h"

	29 #include "ash/root_window_controller.h"

30 #include "base/command_line.h"	30 #include "base/command_line.h"

31 #include "base/test/user_action_tester.cc"	31 #include "base/test/user_action_tester.cc"

32 #include "services/ui/public/interfaces/window_manager.mojom.h"	32 #include "services/ui/public/interfaces/window_manager.mojom.h"

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

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

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

36 #include "ui/events/event_processor.h"	36 #include "ui/events/event_processor.h"

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

38 #include "ui/message_center/message_center.h"	38 #include "ui/message_center/message_center.h"

39 #include "ui/views/widget/widget.h"	39 #include "ui/views/widget/widget.h"

(...skipping 1425 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1465 EXPECT_TRUE(IsMessageCenterEmpty());	1465 EXPECT_TRUE(IsMessageCenterEmpty());

1466	1466

1467 // If the action is LOCK_SCREEN, we must reset the state by unlocking the	1467 // If the action is LOCK_SCREEN, we must reset the state by unlocking the

1468 // screen before we proceed testing the rest of accelerators.	1468 // screen before we proceed testing the rest of accelerators.

1469 ResetStateIfNeeded();	1469 ResetStateIfNeeded();

1470 }	1470 }

1471 }	1471 }

1472 #endif // defined(OS_CHROMEOS)	1472 #endif // defined(OS_CHROMEOS)

1473	1473

1474 } // namespace ash	1474 } // namespace ash

OLD	NEW