ash/wm/window_cycle_controller_unittest.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

Side by Side Diff: ash/wm/window_cycle_controller_unittest.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. Created 4 years, 4 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/wm/window_animations.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/wm/window_cycle_controller.h"	5 #include "ash/common/wm/window_cycle_controller.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <memory>	8 #include <memory>

9	9

10 #include "ash/aura/wm_window_aura.h"	10 #include "ash/aura/wm_window_aura.h"

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

12 #include "ash/common/scoped_root_window_for_new_windows.h"	12 #include "ash/common/scoped_root_window_for_new_windows.h"

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

	14 #include "ash/common/shelf/shelf.h"

	15 #include "ash/common/shelf/shelf_widget.h"

14 #include "ash/common/shell_window_ids.h"	16 #include "ash/common/shell_window_ids.h"

15 #include "ash/common/wm/window_cycle_list.h"	17 #include "ash/common/wm/window_cycle_list.h"

16 #include "ash/common/wm/window_state.h"	18 #include "ash/common/wm/window_state.h"

17 #include "ash/common/wm/wm_event.h"	19 #include "ash/common/wm/wm_event.h"

18 #include "ash/common/wm_shell.h"	20 #include "ash/common/wm_shell.h"

19 #include "ash/shelf/shelf.h"

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

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

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

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

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

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

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

27 #include "ash/wm/window_state_aura.h"	27 #include "ash/wm/window_state_aura.h"

28 #include "ash/wm/window_util.h"	28 #include "ash/wm/window_util.h"

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

30 #include "ui/aura/client/screen_position_client.h"	30 #include "ui/aura/client/screen_position_client.h"

(...skipping 574 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
605 // without the new alt+tab selector we check for the event on either	605 // without the new alt+tab selector we check for the event on either

606 // fullscreen window.	606 // fullscreen window.

607 KeyEventCounter key_count;	607 KeyEventCounter key_count;

608 w0->AddPreTargetHandler(&key_count);	608 w0->AddPreTargetHandler(&key_count);

609 w1->AddPreTargetHandler(&key_count);	609 w1->AddPreTargetHandler(&key_count);

610 generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);	610 generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);

611 EXPECT_EQ(1u, key_count.GetCountAndReset());	611 EXPECT_EQ(1u, key_count.GetCountAndReset());

612 }	612 }

613	613

614 } // namespace ash	614 } // namespace ash

OLD	NEW