ash/accelerators/accelerator_controller_unittest.cc - Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common

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

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common

Patch Set: merge Created 4 years, 6 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:

View unified diff | Download patch

« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_filter_unittest.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/accelerators/accelerator_controller.h"	5 #include "ash/accelerators/accelerator_controller.h"

6	6

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

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

9 #include "ash/ash_switches.h"	9 #include "ash/ash_switches.h"

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

10 #include "ash/common/wm/panels/panel_layout_manager.h"	11 #include "ash/common/wm/panels/panel_layout_manager.h"

11 #include "ash/common/wm/window_positioning_utils.h"	12 #include "ash/common/wm/window_positioning_utils.h"

12 #include "ash/common/wm/window_state.h"	13 #include "ash/common/wm/window_state.h"

13 #include "ash/common/wm/wm_event.h"	14 #include "ash/common/wm/wm_event.h"

14 #include "ash/display/display_manager.h"	15 #include "ash/display/display_manager.h"

15 #include "ash/ime_control_delegate.h"	16 #include "ash/ime_control_delegate.h"

16 #include "ash/screen_util.h"	17 #include "ash/screen_util.h"

17 #include "ash/shell.h"	18 #include "ash/shell.h"

18 #include "ash/shell_window_ids.h"

19 #include "ash/system/brightness_control_delegate.h"	19 #include "ash/system/brightness_control_delegate.h"

20 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"	20 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"

21 #include "ash/system/tray/system_tray_delegate.h"	21 #include "ash/system/tray/system_tray_delegate.h"

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

23 #include "ash/test/display_manager_test_api.h"	23 #include "ash/test/display_manager_test_api.h"

24 #include "ash/test/test_screenshot_delegate.h"	24 #include "ash/test/test_screenshot_delegate.h"

25 #include "ash/test/test_session_state_animator.h"	25 #include "ash/test/test_session_state_animator.h"

26 #include "ash/test/test_shelf_delegate.h"	26 #include "ash/test/test_shelf_delegate.h"

27 #include "ash/test/test_shell_delegate.h"	27 #include "ash/test/test_shell_delegate.h"

28 #include "ash/test/test_volume_control_delegate.h"	28 #include "ash/test/test_volume_control_delegate.h"

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

1579	1579

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

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

1582 ResetStateIfNeeded();	1582 ResetStateIfNeeded();

1583 }	1583 }

1584 }	1584 }

1585 #endif // defined(OS_CHROMEOS)	1585 #endif // defined(OS_CHROMEOS)

1586	1586

1587 } // namespace ash	1587 } // namespace ash

OLD	NEW