| 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/accelerators/accelerator_controller.h" | 5 #include "ash/common/accelerators/accelerator_controller.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
| 8 #include "ash/common/accelerators/accelerator_table.h" | 8 #include "ash/common/accelerators/accelerator_table.h" |
| 9 #include "ash/common/accessibility_delegate.h" | 9 #include "ash/common/accessibility_delegate.h" |
| 10 #include "ash/common/accessibility_types.h" | 10 #include "ash/common/accessibility_types.h" |
| 11 #include "ash/common/ime_control_delegate.h" | 11 #include "ash/common/ime_control_delegate.h" |
| 12 #include "ash/common/session/session_state_delegate.h" | 12 #include "ash/common/session/session_state_delegate.h" |
| 13 #include "ash/common/system/brightness_control_delegate.h" | 13 #include "ash/common/system/brightness_control_delegate.h" |
| 14 #include "ash/common/system/keyboard_brightness_control_delegate.h" | 14 #include "ash/common/system/keyboard_brightness_control_delegate.h" |
| 15 #include "ash/common/system/tray/system_tray_delegate.h" | 15 #include "ash/common/system/tray/system_tray_delegate.h" |
| 16 #include "ash/common/test/test_shelf_delegate.h" | 16 #include "ash/common/test/test_shelf_delegate.h" |
| 17 #include "ash/common/wm/panels/panel_layout_manager.h" | 17 #include "ash/common/wm/panels/panel_layout_manager.h" |
| 18 #include "ash/common/wm/window_positioning_utils.h" | 18 #include "ash/common/wm/window_positioning_utils.h" |
| 19 #include "ash/common/wm/window_state.h" | 19 #include "ash/common/wm/window_state.h" |
| 20 #include "ash/common/wm/wm_event.h" | 20 #include "ash/common/wm/wm_event.h" |
| 21 #include "ash/common/wm_shell.h" | 21 #include "ash/common/wm_shell.h" |
| 22 #include "ash/display/display_manager.h" | |
| 23 #include "ash/public/cpp/shell_window_ids.h" | 22 #include "ash/public/cpp/shell_window_ids.h" |
| 24 #include "ash/shell.h" | 23 #include "ash/shell.h" |
| 25 #include "ash/test/ash_test_base.h" | 24 #include "ash/test/ash_test_base.h" |
| 26 #include "ash/test/display_manager_test_api.h" | |
| 27 #include "ash/test/test_screenshot_delegate.h" | 25 #include "ash/test/test_screenshot_delegate.h" |
| 28 #include "ash/test/test_session_state_animator.h" | 26 #include "ash/test/test_session_state_animator.h" |
| 29 #include "ash/wm/lock_state_controller.h" | 27 #include "ash/wm/lock_state_controller.h" |
| 30 #include "ash/wm/window_state_aura.h" | 28 #include "ash/wm/window_state_aura.h" |
| 31 #include "ash/wm/window_util.h" | 29 #include "ash/wm/window_util.h" |
| 32 #include "base/test/user_action_tester.cc" | 30 #include "base/test/user_action_tester.cc" |
| 33 #include "ui/aura/client/aura_constants.h" | 31 #include "ui/aura/client/aura_constants.h" |
| 34 #include "ui/aura/test/test_window_delegate.h" | 32 #include "ui/aura/test/test_window_delegate.h" |
| 35 #include "ui/aura/test/test_windows.h" | 33 #include "ui/aura/test/test_windows.h" |
| 36 #include "ui/aura/window.h" | 34 #include "ui/aura/window.h" |
| 35 #include "ui/display/manager/display_manager.h" |
| 37 #include "ui/display/screen.h" | 36 #include "ui/display/screen.h" |
| 38 #include "ui/events/event.h" | 37 #include "ui/events/event.h" |
| 39 #include "ui/events/event_processor.h" | 38 #include "ui/events/event_processor.h" |
| 40 #include "ui/events/test/event_generator.h" | 39 #include "ui/events/test/event_generator.h" |
| 41 #include "ui/message_center/message_center.h" | 40 #include "ui/message_center/message_center.h" |
| 42 #include "ui/views/widget/widget.h" | 41 #include "ui/views/widget/widget.h" |
| 43 | 42 |
| 44 #if defined(USE_X11) | 43 #if defined(USE_X11) |
| 45 #include <X11/Xlib.h> | 44 #include <X11/Xlib.h> |
| 46 #include "ui/events/test/events_test_utils_x11.h" | 45 #include "ui/events/test/events_test_utils_x11.h" |
| (...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1411 EXPECT_TRUE(IsMessageCenterEmpty()); | 1410 EXPECT_TRUE(IsMessageCenterEmpty()); |
| 1412 | 1411 |
| 1413 // If the action is LOCK_SCREEN, we must reset the state by unlocking the | 1412 // If the action is LOCK_SCREEN, we must reset the state by unlocking the |
| 1414 // screen before we proceed testing the rest of accelerators. | 1413 // screen before we proceed testing the rest of accelerators. |
| 1415 ResetStateIfNeeded(); | 1414 ResetStateIfNeeded(); |
| 1416 } | 1415 } |
| 1417 } | 1416 } |
| 1418 #endif // defined(OS_CHROMEOS) | 1417 #endif // defined(OS_CHROMEOS) |
| 1419 | 1418 |
| 1420 } // namespace ash | 1419 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2445583002:
Relocate display_manager from ash to ui (Closed)
