ash/shelf/shelf_layout_manager_unittest.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

Side by Side Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase Created 4 years, 5 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/shelf/shelf_layout_manager.cc ('k') | ash/shell.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/shelf/shelf_layout_manager.h"	5 #include "ash/shelf/shelf_layout_manager.h"

6	6

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

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

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

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

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

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

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

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

	15 #include "ash/common/system/status_area_widget.h"

	16 #include "ash/common/system/tray/system_tray.h"

15 #include "ash/common/system/tray/system_tray_item.h"	17 #include "ash/common/system/tray/system_tray_item.h"

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

17 #include "ash/common/wm_shell.h"	19 #include "ash/common/wm_shell.h"

18 #include "ash/display/display_manager.h"	20 #include "ash/display/display_manager.h"

19 #include "ash/display/window_tree_host_manager.h"	21 #include "ash/display/window_tree_host_manager.h"

20 #include "ash/root_window_controller.h"	22 #include "ash/root_window_controller.h"

21 #include "ash/shelf/shelf.h"	23 #include "ash/shelf/shelf.h"

22 #include "ash/shelf/shelf_layout_manager_observer.h"	24 #include "ash/shelf/shelf_layout_manager_observer.h"

23 #include "ash/shelf/shelf_locking_manager.h"	25 #include "ash/shelf/shelf_locking_manager.h"

24 #include "ash/shelf/shelf_view.h"	26 #include "ash/shelf/shelf_view.h"

25 #include "ash/shelf/shelf_widget.h"	27 #include "ash/shelf/shelf_widget.h"

26 #include "ash/shell.h"	28 #include "ash/shell.h"

27 #include "ash/system/status_area_widget.h"

28 #include "ash/system/tray/system_tray.h"

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

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

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

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

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

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

35 #include "base/strings/utf_string_conversions.h"	35 #include "base/strings/utf_string_conversions.h"

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

37 #include "ui/aura/client/window_tree_client.h"	37 #include "ui/aura/client/window_tree_client.h"

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

(...skipping 2226 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2265 ->shelf_widget()	2265 ->shelf_widget()

2266 ->status_area_widget();	2266 ->status_area_widget();

2267 EXPECT_TRUE(status_area_widget->IsVisible());	2267 EXPECT_TRUE(status_area_widget->IsVisible());

2268 // Shelf should be in the first display's area.	2268 // Shelf should be in the first display's area.

2269 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());	2269 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());

2270 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));	2270 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));

2271 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());	2271 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());

2272 }	2272 }

2273	2273

2274 } // namespace ash	2274 } // namespace ash

OLD	NEW