| 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/aura/wm_shelf_aura.h" | 7 #include "ash/aura/wm_shelf_aura.h" |
| 8 #include "ash/aura/wm_window_aura.h" | 8 #include "ash/aura/wm_window_aura.h" |
| 9 #include "ash/common/accelerators/accelerator_controller.h" | 9 #include "ash/common/accelerators/accelerator_controller.h" |
| 10 #include "ash/common/accelerators/accelerator_table.h" | 10 #include "ash/common/accelerators/accelerator_table.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/shelf/shelf_layout_manager_observer.h" | 15 #include "ash/common/shelf/shelf_layout_manager_observer.h" |
| 16 #include "ash/common/shelf/shelf_view.h" | 16 #include "ash/common/shelf/shelf_view.h" |
| 17 #include "ash/common/shelf/shelf_widget.h" | 17 #include "ash/common/shelf/shelf_widget.h" |
| 18 #include "ash/common/shelf/wm_shelf.h" | 18 #include "ash/common/shelf/wm_shelf.h" |
| 19 #include "ash/common/shell_window_ids.h" | 19 #include "ash/common/shell_window_ids.h" |
| 20 #include "ash/common/system/status_area_widget.h" | 20 #include "ash/common/system/status_area_widget.h" |
| 21 #include "ash/common/system/tray/system_tray.h" | 21 #include "ash/common/system/tray/system_tray.h" |
| 22 #include "ash/common/system/tray/system_tray_item.h" | 22 #include "ash/common/system/tray/system_tray_item.h" |
| 23 #include "ash/common/wm/window_state.h" | 23 #include "ash/common/wm/window_state.h" |
| 24 #include "ash/common/wm_shell.h" | 24 #include "ash/common/wm_shell.h" |
| 25 #include "ash/display/display_manager.h" | 25 #include "ash/display/display_manager.h" |
| 26 #include "ash/root_window_controller.h" | 26 #include "ash/root_window_controller.h" |
| 27 #include "ash/shell.h" | 27 #include "ash/shell.h" |
| 28 #include "ash/test/ash_test_base.h" | 28 #include "ash/test/ash_test_base.h" |
| 29 #include "ash/test/display_manager_test_api.h" | 29 #include "ash/test/display_manager_test_api.h" |
| 30 #include "ash/test/shelf_test_api.h" | |
| 31 #include "ash/test/test_system_tray_item.h" | 30 #include "ash/test/test_system_tray_item.h" |
| 32 #include "ash/wm/window_state_aura.h" | 31 #include "ash/wm/window_state_aura.h" |
| 33 #include "ash/wm/window_util.h" | 32 #include "ash/wm/window_util.h" |
| 34 #include "base/command_line.h" | 33 #include "base/command_line.h" |
| 35 #include "base/run_loop.h" | 34 #include "base/run_loop.h" |
| 36 #include "ui/aura/client/aura_constants.h" | 35 #include "ui/aura/client/aura_constants.h" |
| 37 #include "ui/aura/client/window_tree_client.h" | 36 #include "ui/aura/client/window_tree_client.h" |
| 38 #include "ui/aura/window.h" | 37 #include "ui/aura/window.h" |
| 39 #include "ui/aura/window_event_dispatcher.h" | 38 #include "ui/aura/window_event_dispatcher.h" |
| 40 #include "ui/base/ui_base_switches.h" | 39 #include "ui/base/ui_base_switches.h" |
| (...skipping 2035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2076 // Open keyboard in sticky mode. | 2075 // Open keyboard in sticky mode. |
| 2077 kb_controller->ShowKeyboard(true); | 2076 kb_controller->ShowKeyboard(true); |
| 2078 layout_manager->OnKeyboardBoundsChanging(keyboard_bounds()); | 2077 layout_manager->OnKeyboardBoundsChanging(keyboard_bounds()); |
| 2079 | 2078 |
| 2080 // Work area should be changed. | 2079 // Work area should be changed. |
| 2081 EXPECT_NE(orig_work_area, | 2080 EXPECT_NE(orig_work_area, |
| 2082 display::Screen::GetScreen()->GetPrimaryDisplay().work_area()); | 2081 display::Screen::GetScreen()->GetPrimaryDisplay().work_area()); |
| 2083 } | 2082 } |
| 2084 | 2083 |
| 2085 } // namespace ash | 2084 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2293183002:
ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
