| 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/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/accelerators/accelerator_commands.h" | 9 #include "ash/accelerators/accelerator_commands.h" |
| 10 #include "ash/accelerators/accelerator_controller_delegate.h" | 10 #include "ash/accelerators/accelerator_controller_delegate.h" |
| 11 #include "ash/accelerators/debug_commands.h" | 11 #include "ash/accelerators/debug_commands.h" |
| 12 #include "ash/accessibility_delegate.h" | 12 #include "ash/common/accessibility_delegate.h" |
| 13 #include "ash/accessibility_types.h" | 13 #include "ash/common/accessibility_types.h" |
| 14 #include "ash/focus_cycler.h" | 14 #include "ash/common/focus_cycler.h" |
| 15 #include "ash/ime_control_delegate.h" | 15 #include "ash/common/ime_control_delegate.h" |
| 16 #include "ash/media_controller.h" | 16 #include "ash/common/media_controller.h" |
| 17 #include "ash/multi_profile_uma.h" | 17 #include "ash/common/multi_profile_uma.h" |
| 18 #include "ash/new_window_controller.h" | 18 #include "ash/common/new_window_controller.h" |
| 19 #include "ash/palette_delegate.h" | 19 #include "ash/common/palette_delegate.h" |
| 20 #include "ash/common/session/session_state_delegate.h" |
| 21 #include "ash/common/shell_delegate.h" |
| 22 #include "ash/common/wm_shell.h" |
| 23 #include "ash/common/wm_window.h" |
| 20 #include "ash/resources/vector_icons/vector_icons.h" | 24 #include "ash/resources/vector_icons/vector_icons.h" |
| 21 #include "ash/root_window_controller.h" | 25 #include "ash/root_window_controller.h" |
| 22 #include "ash/session/session_state_delegate.h" | |
| 23 #include "ash/shelf/shelf_widget.h" | 26 #include "ash/shelf/shelf_widget.h" |
| 24 #include "ash/shelf/wm_shelf.h" | 27 #include "ash/shelf/wm_shelf.h" |
| 25 #include "ash/shell_delegate.h" | |
| 26 #include "ash/strings/grit/ash_strings.h" | 28 #include "ash/strings/grit/ash_strings.h" |
| 27 #include "ash/system/brightness_control_delegate.h" | 29 #include "ash/system/brightness_control_delegate.h" |
| 28 #include "ash/system/ime_menu/ime_menu_tray.h" | 30 #include "ash/system/ime_menu/ime_menu_tray.h" |
| 29 #include "ash/system/keyboard_brightness_control_delegate.h" | 31 #include "ash/system/keyboard_brightness_control_delegate.h" |
| 30 #include "ash/system/palette/palette_tray.h" | 32 #include "ash/system/palette/palette_tray.h" |
| 31 #include "ash/system/palette/palette_utils.h" | 33 #include "ash/system/palette/palette_utils.h" |
| 32 #include "ash/system/status_area_widget.h" | 34 #include "ash/system/status_area_widget.h" |
| 33 #include "ash/system/system_notifier.h" | 35 #include "ash/system/system_notifier.h" |
| 34 #include "ash/system/tray/system_tray_delegate.h" | 36 #include "ash/system/tray/system_tray_delegate.h" |
| 35 #include "ash/system/tray/system_tray_notifier.h" | 37 #include "ash/system/tray/system_tray_notifier.h" |
| 36 #include "ash/system/web_notification/web_notification_tray.h" | 38 #include "ash/system/web_notification/web_notification_tray.h" |
| 37 #include "ash/wm/mru_window_tracker.h" | 39 #include "ash/wm/mru_window_tracker.h" |
| 38 #include "ash/wm/overview/window_selector_controller.h" | 40 #include "ash/wm/overview/window_selector_controller.h" |
| 39 #include "ash/wm/window_cycle_controller.h" | 41 #include "ash/wm/window_cycle_controller.h" |
| 40 #include "ash/wm/window_positioning_utils.h" | 42 #include "ash/wm/window_positioning_utils.h" |
| 41 #include "ash/wm/window_state.h" | 43 #include "ash/wm/window_state.h" |
| 42 #include "ash/wm/wm_event.h" | 44 #include "ash/wm/wm_event.h" |
| 43 #include "ash/wm_shell.h" | |
| 44 #include "ash/wm_window.h" | |
| 45 #include "base/metrics/histogram_macros.h" | 45 #include "base/metrics/histogram_macros.h" |
| 46 #include "base/metrics/user_metrics.h" | 46 #include "base/metrics/user_metrics.h" |
| 47 #include "chromeos/dbus/dbus_thread_manager.h" | 47 #include "chromeos/dbus/dbus_thread_manager.h" |
| 48 #include "chromeos/dbus/power_manager_client.h" | 48 #include "chromeos/dbus/power_manager_client.h" |
| 49 #include "ui/base/accelerators/accelerator.h" | 49 #include "ui/base/accelerators/accelerator.h" |
| 50 #include "ui/base/accelerators/accelerator_manager.h" | 50 #include "ui/base/accelerators/accelerator_manager.h" |
| 51 #include "ui/base/ime/chromeos/ime_keyboard.h" | 51 #include "ui/base/ime/chromeos/ime_keyboard.h" |
| 52 #include "ui/base/ime/chromeos/input_method_manager.h" | 52 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 53 #include "ui/base/l10n/l10n_util.h" | 53 #include "ui/base/l10n/l10n_util.h" |
| 54 #include "ui/gfx/paint_vector_icon.h" | 54 #include "ui/gfx/paint_vector_icon.h" |
| (...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1164 data->old_shortcut_id, data->new_shortcut_id); | 1164 data->old_shortcut_id, data->new_shortcut_id); |
| 1165 } | 1165 } |
| 1166 | 1166 |
| 1167 if (!data->deprecated_enabled) | 1167 if (!data->deprecated_enabled) |
| 1168 return AcceleratorProcessingStatus::STOP; | 1168 return AcceleratorProcessingStatus::STOP; |
| 1169 | 1169 |
| 1170 return AcceleratorProcessingStatus::PROCEED; | 1170 return AcceleratorProcessingStatus::PROCEED; |
| 1171 } | 1171 } |
| 1172 | 1172 |
| 1173 } // namespace ash | 1173 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2734733002:
Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
