Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: ash/common/accelerators/accelerator_controller.cc

Issue 2166793005: Moves accelerator code using common types to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@debug_commands
Patch Set: not relative Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/common/accelerators/accelerator_controller.h"
6 6
7 #include "ash/accelerators/accelerator_commands.h" 7 #include "ash/common/accelerators/accelerator_commands.h"
8 #include "ash/accelerators/accelerator_controller_delegate.h" 8 #include "ash/common/accelerators/accelerator_controller_delegate.h"
9 #include "ash/accelerators/debug_commands.h" 9 #include "ash/common/accelerators/debug_commands.h"
10 #include "ash/common/accessibility_delegate.h" 10 #include "ash/common/accessibility_delegate.h"
11 #include "ash/common/accessibility_types.h" 11 #include "ash/common/accessibility_types.h"
12 #include "ash/common/focus_cycler.h" 12 #include "ash/common/focus_cycler.h"
13 #include "ash/common/ime_control_delegate.h"
13 #include "ash/common/media_delegate.h" 14 #include "ash/common/media_delegate.h"
14 #include "ash/common/multi_profile_uma.h" 15 #include "ash/common/multi_profile_uma.h"
15 #include "ash/common/session/session_state_delegate.h" 16 #include "ash/common/session/session_state_delegate.h"
16 #include "ash/common/shell_delegate.h" 17 #include "ash/common/shell_delegate.h"
17 #include "ash/common/system/brightness_control_delegate.h" 18 #include "ash/common/system/brightness_control_delegate.h"
18 #include "ash/common/system/keyboard_brightness_control_delegate.h" 19 #include "ash/common/system/keyboard_brightness_control_delegate.h"
19 #include "ash/common/system/tray/system_tray_delegate.h" 20 #include "ash/common/system/tray/system_tray_delegate.h"
20 #include "ash/common/system/tray/system_tray_notifier.h" 21 #include "ash/common/system/tray/system_tray_notifier.h"
21 #include "ash/common/system/volume_control_delegate.h" 22 #include "ash/common/system/volume_control_delegate.h"
22 #include "ash/common/wm/mru_window_tracker.h" 23 #include "ash/common/wm/mru_window_tracker.h"
23 #include "ash/common/wm/overview/window_selector_controller.h" 24 #include "ash/common/wm/overview/window_selector_controller.h"
24 #include "ash/common/wm/window_cycle_controller.h" 25 #include "ash/common/wm/window_cycle_controller.h"
25 #include "ash/common/wm/window_positioning_utils.h" 26 #include "ash/common/wm/window_positioning_utils.h"
26 #include "ash/common/wm/window_state.h" 27 #include "ash/common/wm/window_state.h"
27 #include "ash/common/wm/wm_event.h" 28 #include "ash/common/wm/wm_event.h"
28 #include "ash/common/wm_shell.h" 29 #include "ash/common/wm_shell.h"
29 #include "ash/common/wm_window.h" 30 #include "ash/common/wm_window.h"
30 #include "ash/ime_control_delegate.h"
31 #include "base/metrics/histogram_macros.h" 31 #include "base/metrics/histogram_macros.h"
32 #include "base/metrics/user_metrics.h" 32 #include "base/metrics/user_metrics.h"
33 #include "ui/base/accelerators/accelerator.h" 33 #include "ui/base/accelerators/accelerator.h"
34 #include "ui/base/accelerators/accelerator_manager.h" 34 #include "ui/base/accelerators/accelerator_manager.h"
35 35
36 #if defined(OS_CHROMEOS) 36 #if defined(OS_CHROMEOS)
37 #include "chromeos/dbus/dbus_thread_manager.h" 37 #include "chromeos/dbus/dbus_thread_manager.h"
38 #include "chromeos/dbus/power_manager_client.h" 38 #include "chromeos/dbus/power_manager_client.h"
39 #include "ui/base/ime/chromeos/ime_keyboard.h" 39 #include "ui/base/ime/chromeos/ime_keyboard.h"
40 #include "ui/base/ime/chromeos/input_method_manager.h" 40 #include "ui/base/ime/chromeos/input_method_manager.h"
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() && 827 if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() &&
828 actions_needing_window_.find(action) != actions_needing_window_.end()) { 828 actions_needing_window_.find(action) != actions_needing_window_.end()) {
829 wm_shell->accessibility_delegate()->TriggerAccessibilityAlert( 829 wm_shell->accessibility_delegate()->TriggerAccessibilityAlert(
830 A11Y_ALERT_WINDOW_NEEDED); 830 A11Y_ALERT_WINDOW_NEEDED);
831 return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION; 831 return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
832 } 832 }
833 return RESTRICTION_NONE; 833 return RESTRICTION_NONE;
834 } 834 }
835 835
836 } // namespace ash 836 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/accelerators/accelerator_controller.h ('k') | ash/common/accelerators/accelerator_controller_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698