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

Side by Side Diff: ash/wm/overview/window_selector_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/maximize_mode/maximize_mode_window_manager_unittest.cc ('k') | ash/wm/panels/attached_panel_window_targeter.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 <algorithm>	5 #include <algorithm>

6 #include <vector>	6 #include <vector>

7	7

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

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

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

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

12 #include "ash/common/material_design/material_design_controller.h"	12 #include "ash/common/material_design/material_design_controller.h"

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

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

13 #include "ash/common/shell_window_ids.h"	15 #include "ash/common/shell_window_ids.h"

14 #include "ash/common/test/material_design_controller_test_api.h"	16 #include "ash/common/test/material_design_controller_test_api.h"

15 #include "ash/common/wm/dock/docked_window_layout_manager.h"	17 #include "ash/common/wm/dock/docked_window_layout_manager.h"

16 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"	18 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

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

18 #include "ash/common/wm/overview/scoped_transform_overview_window.h"	20 #include "ash/common/wm/overview/scoped_transform_overview_window.h"

19 #include "ash/common/wm/overview/window_grid.h"	21 #include "ash/common/wm/overview/window_grid.h"

20 #include "ash/common/wm/overview/window_selector.h"	22 #include "ash/common/wm/overview/window_selector.h"

21 #include "ash/common/wm/overview/window_selector_controller.h"	23 #include "ash/common/wm/overview/window_selector_controller.h"

22 #include "ash/common/wm/overview/window_selector_item.h"	24 #include "ash/common/wm/overview/window_selector_item.h"

23 #include "ash/common/wm/panels/panel_layout_manager.h"	25 #include "ash/common/wm/panels/panel_layout_manager.h"

24 #include "ash/common/wm/window_state.h"	26 #include "ash/common/wm/window_state.h"

25 #include "ash/common/wm/wm_event.h"	27 #include "ash/common/wm/wm_event.h"

26 #include "ash/common/wm_shell.h"	28 #include "ash/common/wm_shell.h"

27 #include "ash/display/display_manager.h"	29 #include "ash/display/display_manager.h"

28 #include "ash/drag_drop/drag_drop_controller.h"	30 #include "ash/drag_drop/drag_drop_controller.h"

29 #include "ash/root_window_controller.h"	31 #include "ash/root_window_controller.h"

30 #include "ash/screen_util.h"	32 #include "ash/screen_util.h"

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

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

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

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

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

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

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

38 #include "ash/test/shell_test_api.h"	38 #include "ash/test/shell_test_api.h"

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

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

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

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

(...skipping 2036 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2079 bounds.y());	2079 bounds.y());

2080 EXPECT_LE(transformed_rect.bottom(), bounds.bottom());	2080 EXPECT_LE(transformed_rect.bottom(), bounds.bottom());

2081 EXPECT_NEAR(transformed_rect.x() - bounds.x(),	2081 EXPECT_NEAR(transformed_rect.x() - bounds.x(),

2082 bounds.right() - transformed_rect.right(), 1);	2082 bounds.right() - transformed_rect.right(), 1);

2083 EXPECT_NEAR(	2083 EXPECT_NEAR(

2084 transformed_rect.y() + (int)(scale * inset) - header_height - bounds.y(),	2084 transformed_rect.y() + (int)(scale * inset) - header_height - bounds.y(),

2085 bounds.bottom() - transformed_rect.bottom(), 1);	2085 bounds.bottom() - transformed_rect.bottom(), 1);

2086 }	2086 }

2087	2087

2088 } // namespace ash	2088 } // namespace ash

OLD	NEW