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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « ash/ash_touch_exploration_manager_chromeos.cc ('k') | ash/common/accelerators/debug_commands.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/accelerators/accelerator_controller.h" 5 #include "ash/common/accelerators/accelerator_controller.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_commands.h" 9 #include "ash/common/accelerators/accelerator_commands.h"
10 #include "ash/common/accelerators/accelerator_controller_delegate.h" 10 #include "ash/common/accelerators/accelerator_controller_delegate.h"
11 #include "ash/common/accelerators/debug_commands.h" 11 #include "ash/common/accelerators/debug_commands.h"
12 #include "ash/common/accessibility_delegate.h" 12 #include "ash/common/accessibility_delegate.h"
13 #include "ash/common/accessibility_types.h" 13 #include "ash/common/accessibility_types.h"
14 #include "ash/common/focus_cycler.h" 14 #include "ash/common/focus_cycler.h"
15 #include "ash/common/ime_control_delegate.h" 15 #include "ash/common/ime_control_delegate.h"
16 #include "ash/common/media_controller.h" 16 #include "ash/common/media_controller.h"
17 #include "ash/common/multi_profile_uma.h" 17 #include "ash/common/multi_profile_uma.h"
18 #include "ash/common/new_window_controller.h" 18 #include "ash/common/new_window_controller.h"
19 #include "ash/common/palette_delegate.h" 19 #include "ash/common/palette_delegate.h"
20 #include "ash/common/session/session_state_delegate.h" 20 #include "ash/common/session/session_state_delegate.h"
21 #include "ash/common/shelf/shelf_widget.h" 21 #include "ash/common/shelf/shelf_widget.h"
22 #include "ash/common/shelf/wm_shelf.h" 22 #include "ash/common/shelf/wm_shelf.h"
23 #include "ash/common/shell_delegate.h" 23 #include "ash/common/shell_delegate.h"
24 #include "ash/common/system/brightness_control_delegate.h"
25 #include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"
26 #include "ash/common/system/chromeos/palette/palette_tray.h"
27 #include "ash/common/system/chromeos/palette/palette_utils.h"
28 #include "ash/common/system/keyboard_brightness_control_delegate.h"
29 #include "ash/common/system/status_area_widget.h"
30 #include "ash/common/system/system_notifier.h"
31 #include "ash/common/system/tray/system_tray_delegate.h"
32 #include "ash/common/system/tray/system_tray_notifier.h"
33 #include "ash/common/system/web_notification/web_notification_tray.h"
34 #include "ash/common/wm/mru_window_tracker.h" 24 #include "ash/common/wm/mru_window_tracker.h"
35 #include "ash/common/wm/overview/window_selector_controller.h" 25 #include "ash/common/wm/overview/window_selector_controller.h"
36 #include "ash/common/wm/window_cycle_controller.h" 26 #include "ash/common/wm/window_cycle_controller.h"
37 #include "ash/common/wm/window_positioning_utils.h" 27 #include "ash/common/wm/window_positioning_utils.h"
38 #include "ash/common/wm/window_state.h" 28 #include "ash/common/wm/window_state.h"
39 #include "ash/common/wm/wm_event.h" 29 #include "ash/common/wm/wm_event.h"
40 #include "ash/common/wm_shell.h" 30 #include "ash/common/wm_shell.h"
41 #include "ash/common/wm_window.h" 31 #include "ash/common/wm_window.h"
42 #include "ash/resources/vector_icons/vector_icons.h" 32 #include "ash/resources/vector_icons/vector_icons.h"
43 #include "ash/root_window_controller.h" 33 #include "ash/root_window_controller.h"
44 #include "ash/strings/grit/ash_strings.h" 34 #include "ash/strings/grit/ash_strings.h"
35 #include "ash/system/brightness_control_delegate.h"
36 #include "ash/system/ime_menu/ime_menu_tray.h"
37 #include "ash/system/keyboard_brightness_control_delegate.h"
38 #include "ash/system/palette/palette_tray.h"
39 #include "ash/system/palette/palette_utils.h"
40 #include "ash/system/status_area_widget.h"
41 #include "ash/system/system_notifier.h"
42 #include "ash/system/tray/system_tray_delegate.h"
43 #include "ash/system/tray/system_tray_notifier.h"
44 #include "ash/system/web_notification/web_notification_tray.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
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
OLDNEW
« no previous file with comments | « ash/ash_touch_exploration_manager_chromeos.cc ('k') | ash/common/accelerators/debug_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698