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

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: rebase 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
« no previous file with comments | « no previous file | ash/ash.gyp » ('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/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "ash/accelerators/accelerator_commands.h" 12 #include "ash/accelerators/accelerator_commands.h"
13 #include "ash/accelerators/debug_commands.h" 13 #include "ash/accelerators/debug_commands.h"
14 #include "ash/common/accessibility_delegate.h" 14 #include "ash/common/accessibility_delegate.h"
15 #include "ash/common/accessibility_types.h" 15 #include "ash/common/accessibility_types.h"
16 #include "ash/common/ash_switches.h" 16 #include "ash/common/ash_switches.h"
17 #include "ash/common/focus_cycler.h" 17 #include "ash/common/focus_cycler.h"
18 #include "ash/common/media_delegate.h" 18 #include "ash/common/media_delegate.h"
19 #include "ash/common/multi_profile_uma.h" 19 #include "ash/common/multi_profile_uma.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_model.h" 21 #include "ash/common/shelf/shelf_model.h"
22 #include "ash/common/shell_delegate.h" 22 #include "ash/common/shell_delegate.h"
23 #include "ash/common/shell_window_ids.h" 23 #include "ash/common/shell_window_ids.h"
24 #include "ash/common/system/brightness_control_delegate.h" 24 #include "ash/common/system/brightness_control_delegate.h"
25 #include "ash/common/system/keyboard_brightness_control_delegate.h" 25 #include "ash/common/system/keyboard_brightness_control_delegate.h"
26 #include "ash/common/system/status_area_widget.h"
26 #include "ash/common/system/system_notifier.h" 27 #include "ash/common/system/system_notifier.h"
28 #include "ash/common/system/tray/system_tray.h"
27 #include "ash/common/system/tray/system_tray_delegate.h" 29 #include "ash/common/system/tray/system_tray_delegate.h"
28 #include "ash/common/system/tray/system_tray_notifier.h" 30 #include "ash/common/system/tray/system_tray_notifier.h"
29 #include "ash/common/system/volume_control_delegate.h" 31 #include "ash/common/system/volume_control_delegate.h"
30 #include "ash/common/system/web_notification/web_notification_tray.h" 32 #include "ash/common/system/web_notification/web_notification_tray.h"
31 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 33 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
32 #include "ash/common/wm/mru_window_tracker.h" 34 #include "ash/common/wm/mru_window_tracker.h"
33 #include "ash/common/wm/overview/window_selector_controller.h" 35 #include "ash/common/wm/overview/window_selector_controller.h"
34 #include "ash/common/wm/window_state.h" 36 #include "ash/common/wm/window_state.h"
35 #include "ash/common/wm/wm_event.h" 37 #include "ash/common/wm/wm_event.h"
36 #include "ash/common/wm_shell.h" 38 #include "ash/common/wm_shell.h"
37 #include "ash/debug.h" 39 #include "ash/debug.h"
38 #include "ash/display/window_tree_host_manager.h" 40 #include "ash/display/window_tree_host_manager.h"
39 #include "ash/gpu_support.h" 41 #include "ash/gpu_support.h"
40 #include "ash/ime_control_delegate.h" 42 #include "ash/ime_control_delegate.h"
41 #include "ash/magnifier/magnification_controller.h" 43 #include "ash/magnifier/magnification_controller.h"
42 #include "ash/magnifier/partial_magnification_controller.h" 44 #include "ash/magnifier/partial_magnification_controller.h"
43 #include "ash/new_window_delegate.h" 45 #include "ash/new_window_delegate.h"
44 #include "ash/root_window_controller.h" 46 #include "ash/root_window_controller.h"
45 #include "ash/rotator/screen_rotation_animator.h" 47 #include "ash/rotator/screen_rotation_animator.h"
46 #include "ash/rotator/window_rotation.h" 48 #include "ash/rotator/window_rotation.h"
47 #include "ash/screen_util.h" 49 #include "ash/screen_util.h"
48 #include "ash/screenshot_delegate.h" 50 #include "ash/screenshot_delegate.h"
49 #include "ash/shelf/shelf.h" 51 #include "ash/shelf/shelf.h"
50 #include "ash/shelf/shelf_delegate.h" 52 #include "ash/shelf/shelf_delegate.h"
51 #include "ash/shelf/shelf_widget.h" 53 #include "ash/shelf/shelf_widget.h"
52 #include "ash/shell.h" 54 #include "ash/shell.h"
53 #include "ash/system/status_area_widget.h"
54 #include "ash/system/tray/system_tray.h"
55 #include "ash/touch/touch_hud_debug.h" 55 #include "ash/touch/touch_hud_debug.h"
56 #include "ash/utility/screenshot_controller.h" 56 #include "ash/utility/screenshot_controller.h"
57 #include "ash/wm/power_button_controller.h" 57 #include "ash/wm/power_button_controller.h"
58 #include "ash/wm/window_cycle_controller.h" 58 #include "ash/wm/window_cycle_controller.h"
59 #include "ash/wm/window_state_aura.h" 59 #include "ash/wm/window_state_aura.h"
60 #include "ash/wm/window_util.h" 60 #include "ash/wm/window_util.h"
61 #include "base/bind.h" 61 #include "base/bind.h"
62 #include "base/command_line.h" 62 #include "base/command_line.h"
63 #include "base/metrics/histogram_macros.h" 63 #include "base/metrics/histogram_macros.h"
64 #include "base/metrics/user_metrics.h" 64 #include "base/metrics/user_metrics.h"
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() && 1408 if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() &&
1409 actions_needing_window_.find(action) != actions_needing_window_.end()) { 1409 actions_needing_window_.find(action) != actions_needing_window_.end()) {
1410 wm_shell->GetAccessibilityDelegate()->TriggerAccessibilityAlert( 1410 wm_shell->GetAccessibilityDelegate()->TriggerAccessibilityAlert(
1411 A11Y_ALERT_WINDOW_NEEDED); 1411 A11Y_ALERT_WINDOW_NEEDED);
1412 return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION; 1412 return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION;
1413 } 1413 }
1414 return RESTRICTION_NONE; 1414 return RESTRICTION_NONE;
1415 } 1415 }
1416 1416
1417 } // namespace ash 1417 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698