| 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/material_design/material_design_controller.h" | 12 #include "ash/common/material_design/material_design_controller.h" |
| 13 #include "ash/common/session/session_state_delegate.h" | 13 #include "ash/common/session/session_state_delegate.h" |
| 14 #include "ash/common/shelf/shelf_constants.h" | 14 #include "ash/common/shelf/shelf_constants.h" |
| 15 #include "ash/common/shell_window_ids.h" | 15 #include "ash/common/shell_window_ids.h" |
| 16 #include "ash/common/system/status_area_widget.h" | 16 #include "ash/common/system/status_area_widget.h" |
| 17 #include "ash/common/system/tray/system_tray.h" | 17 #include "ash/common/system/tray/system_tray.h" |
| 18 #include "ash/common/system/tray/system_tray_item.h" | 18 #include "ash/common/system/tray/system_tray_item.h" |
| 19 #include "ash/common/wm/window_state.h" | 19 #include "ash/common/wm/window_state.h" |
| 20 #include "ash/common/wm_shell.h" | 20 #include "ash/common/wm_shell.h" |
| 21 #include "ash/display/display_manager.h" | 21 #include "ash/display/display_manager.h" |
| 22 #include "ash/display/window_tree_host_manager.h" | 22 #include "ash/display/window_tree_host_manager.h" |
| 23 #include "ash/root_window_controller.h" | 23 #include "ash/root_window_controller.h" |
| 24 #include "ash/shelf/shelf.h" | 24 #include "ash/shelf/shelf.h" |
| 25 #include "ash/shelf/shelf_layout_manager_observer.h" | 25 #include "ash/shelf/shelf_layout_manager_observer.h" |
| 26 #include "ash/shelf/shelf_locking_manager.h" | |
| 27 #include "ash/shelf/shelf_view.h" | 26 #include "ash/shelf/shelf_view.h" |
| 28 #include "ash/shelf/shelf_widget.h" | 27 #include "ash/shelf/shelf_widget.h" |
| 29 #include "ash/shell.h" | 28 #include "ash/shell.h" |
| 30 #include "ash/test/ash_test_base.h" | 29 #include "ash/test/ash_test_base.h" |
| 31 #include "ash/test/display_manager_test_api.h" | 30 #include "ash/test/display_manager_test_api.h" |
| 32 #include "ash/test/shelf_test_api.h" | 31 #include "ash/test/shelf_test_api.h" |
| 33 #include "ash/wm/window_state_aura.h" | 32 #include "ash/wm/window_state_aura.h" |
| 34 #include "ash/wm/window_util.h" | 33 #include "ash/wm/window_util.h" |
| 35 #include "base/command_line.h" | 34 #include "base/command_line.h" |
| 36 #include "base/strings/utf_string_conversions.h" | 35 #include "base/strings/utf_string_conversions.h" |
| (...skipping 2245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2282 ->shelf_widget() | 2281 ->shelf_widget() |
| 2283 ->status_area_widget(); | 2282 ->status_area_widget(); |
| 2284 EXPECT_TRUE(status_area_widget->IsVisible()); | 2283 EXPECT_TRUE(status_area_widget->IsVisible()); |
| 2285 // Shelf should be in the first display's area. | 2284 // Shelf should be in the first display's area. |
| 2286 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen()); | 2285 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen()); |
| 2287 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds)); | 2286 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds)); |
| 2288 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right()); | 2287 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right()); |
| 2289 } | 2288 } |
| 2290 | 2289 |
| 2291 } // namespace ash | 2290 } // namespace ash |
| OLD | NEW |