ash/wm/dock/docked_window_layout_manager_unittest.cc - Issue 2187513003: mash: Partially migrate ShelfLayoutManager to ash common types.

Side by Side Diff: ash/wm/dock/docked_window_layout_manager_unittest.cc

Issue 2187513003: mash: Partially migrate ShelfLayoutManager to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and 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

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 "ash/common/wm/dock/docked_window_layout_manager.h"	5 #include "ash/common/wm/dock/docked_window_layout_manager.h"

6	6

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

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

9 #include "ash/common/shelf/shelf_model.h"

10 #include "ash/common/shelf/shelf_types.h"

11 #include "ash/common/shell_window_ids.h"	8 #include "ash/common/shell_window_ids.h"

12 #include "ash/common/wm/panels/panel_layout_manager.h"	9 #include "ash/common/wm/panels/panel_layout_manager.h"

13 #include "ash/common/wm/window_resizer.h"	10 #include "ash/common/wm/window_resizer.h"

14 #include "ash/common/wm/window_state.h"	11 #include "ash/common/wm/window_state.h"

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

16 #include "ash/root_window_controller.h"	13 #include "ash/root_window_controller.h"

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

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

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

20 #include "ash/shell.h"	15 #include "ash/shell.h"

21 #include "ash/test/ash_test_base.h"	16 #include "ash/test/ash_test_base.h"

22 #include "ash/test/display_manager_test_api.h"	17 #include "ash/test/display_manager_test_api.h"

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

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

25 #include "ash/test/shell_test_api.h"	20 #include "ash/test/shell_test_api.h"

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

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

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

29 #include "base/command_line.h"

30 #include "base/strings/string_number_conversions.h"	24 #include "base/strings/string_number_conversions.h"

31 #include "ui/aura/client/aura_constants.h"	25 #include "ui/aura/client/aura_constants.h"

32 #include "ui/aura/test/test_window_delegate.h"	26 #include "ui/aura/test/test_window_delegate.h"

33 #include "ui/aura/window.h"	27 #include "ui/aura/window.h"

34 #include "ui/aura/window_event_dispatcher.h"	28 #include "ui/aura/window_event_dispatcher.h"

35 #include "ui/base/hit_test.h"	29 #include "ui/base/hit_test.h"

36 #include "ui/display/manager/display_layout.h"	30 #include "ui/display/manager/display_layout.h"

37 #include "ui/display/screen.h"	31 #include "ui/display/screen.h"

38 #include "ui/views/widget/widget.h"	32 #include "ui/views/widget/widget.h"

39 #include "ui/wm/core/coordinate_conversion.h"	33 #include "ui/wm/core/coordinate_conversion.h"

(...skipping 819 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
859 EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height());	853 EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height());

860 }	854 }

861	855

862 // Tests run twice - on both panels and normal windows	856 // Tests run twice - on both panels and normal windows

863 INSTANTIATE_TEST_CASE_P(NormalOrPanel,	857 INSTANTIATE_TEST_CASE_P(NormalOrPanel,

864 DockedWindowLayoutManagerTest,	858 DockedWindowLayoutManagerTest,

865 testing::Values(ui::wm::WINDOW_TYPE_NORMAL,	859 testing::Values(ui::wm::WINDOW_TYPE_NORMAL,

866 ui::wm::WINDOW_TYPE_PANEL));	860 ui::wm::WINDOW_TYPE_PANEL));

867	861

868 } // namespace ash	862 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/sysui/shelf_delegate_mus.cc ('k') | ash/wm/dock/docked_window_resizer_unittest.cc » ('j') | no next file with comments »