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/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/common/shell_window_ids.h" |
10 #include "ash/common/wm/window_state.h" | 11 #include "ash/common/wm/window_state.h" |
11 #include "ash/display/display_manager.h" | 12 #include "ash/display/display_manager.h" |
12 #include "ash/display/window_tree_host_manager.h" | 13 #include "ash/display/window_tree_host_manager.h" |
13 #include "ash/focus_cycler.h" | 14 #include "ash/focus_cycler.h" |
14 #include "ash/root_window_controller.h" | 15 #include "ash/root_window_controller.h" |
15 #include "ash/session/session_state_delegate.h" | 16 #include "ash/session/session_state_delegate.h" |
16 #include "ash/shelf/shelf.h" | 17 #include "ash/shelf/shelf.h" |
17 #include "ash/shelf/shelf_layout_manager_observer.h" | 18 #include "ash/shelf/shelf_layout_manager_observer.h" |
18 #include "ash/shelf/shelf_locking_manager.h" | 19 #include "ash/shelf/shelf_locking_manager.h" |
19 #include "ash/shelf/shelf_view.h" | 20 #include "ash/shelf/shelf_view.h" |
20 #include "ash/shelf/shelf_widget.h" | 21 #include "ash/shelf/shelf_widget.h" |
21 #include "ash/shell.h" | 22 #include "ash/shell.h" |
22 #include "ash/shell_window_ids.h" | |
23 #include "ash/system/status_area_widget.h" | 23 #include "ash/system/status_area_widget.h" |
24 #include "ash/system/tray/system_tray.h" | 24 #include "ash/system/tray/system_tray.h" |
25 #include "ash/system/tray/system_tray_item.h" | 25 #include "ash/system/tray/system_tray_item.h" |
26 #include "ash/test/ash_test_base.h" | 26 #include "ash/test/ash_test_base.h" |
27 #include "ash/test/display_manager_test_api.h" | 27 #include "ash/test/display_manager_test_api.h" |
28 #include "ash/test/shelf_test_api.h" | 28 #include "ash/test/shelf_test_api.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/strings/utf_string_conversions.h" | 32 #include "base/strings/utf_string_conversions.h" |
(...skipping 2275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2308 ->shelf_widget() | 2308 ->shelf_widget() |
2309 ->status_area_widget(); | 2309 ->status_area_widget(); |
2310 EXPECT_TRUE(status_area_widget->IsVisible()); | 2310 EXPECT_TRUE(status_area_widget->IsVisible()); |
2311 // Shelf should be in the first display's area. | 2311 // Shelf should be in the first display's area. |
2312 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen()); | 2312 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen()); |
2313 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds)); | 2313 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds)); |
2314 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right()); | 2314 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right()); |
2315 } | 2315 } |
2316 | 2316 |
2317 } // namespace ash | 2317 } // namespace ash |
OLD | NEW |