ash/shelf/shelf_layout_manager_unittest.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase Created 3 years, 9 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:

« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shelf/shelf_view_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/common/shelf/shelf_layout_manager.h"	5 #include "ash/common/shelf/shelf_layout_manager.h"

6	6

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

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

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

10 #include "ash/common/session/session_controller.h"	10 #include "ash/common/session/session_controller.h"

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

12 #include "ash/common/shelf/shelf_layout_manager_observer.h"	12 #include "ash/common/shelf/shelf_layout_manager_observer.h"

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

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

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

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

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

18 #include "ash/common/system/tray/system_tray_item.h"

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

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

21 #include "ash/common/wm_window.h"	18 #include "ash/common/wm_window.h"

22 #include "ash/public/cpp/shell_window_ids.h"	19 #include "ash/public/cpp/shell_window_ids.h"

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

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

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

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

	24 #include "ash/system/tray/system_tray_item.h"

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

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

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

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

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

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

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

32 #include "base/memory/ptr_util.h"	32 #include "base/memory/ptr_util.h"

33 #include "base/run_loop.h"	33 #include "base/run_loop.h"

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

(...skipping 1776 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1811 // Open keyboard in sticky mode.	1811 // Open keyboard in sticky mode.

1812 kb_controller->ShowKeyboard(true);	1812 kb_controller->ShowKeyboard(true);

1813 layout_manager->OnKeyboardBoundsChanging(keyboard_bounds());	1813 layout_manager->OnKeyboardBoundsChanging(keyboard_bounds());

1814	1814

1815 // Work area should be changed.	1815 // Work area should be changed.

1816 EXPECT_NE(orig_work_area,	1816 EXPECT_NE(orig_work_area,

1817 display::Screen::GetScreen()->GetPrimaryDisplay().work_area());	1817 display::Screen::GetScreen()->GetPrimaryDisplay().work_area());

1818 }	1818 }

1819	1819

1820 } // namespace ash	1820 } // namespace ash

OLD	NEW