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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_delegate_aura.h" 5 #include "ash/accelerators/accelerator_controller_delegate_aura.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_aura.h" 12 #include "ash/accelerators/accelerator_commands_aura.h"
13 #include "ash/common/accelerators/debug_commands.h" 13 #include "ash/accelerators/debug_commands.h"
14 #include "ash/common/accessibility_types.h" 14 #include "ash/accessibility_types.h"
15 #include "ash/common/session/session_state_delegate.h"
16 #include "ash/common/shelf/wm_shelf.h"
17 #include "ash/common/shell_delegate.h"
18 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
19 #include "ash/common/wm/window_state.h"
20 #include "ash/common/wm/wm_event.h"
21 #include "ash/common/wm_shell.h"
22 #include "ash/debug.h" 15 #include "ash/debug.h"
23 #include "ash/display/display_configuration_controller.h" 16 #include "ash/display/display_configuration_controller.h"
24 #include "ash/display/window_tree_host_manager.h" 17 #include "ash/display/window_tree_host_manager.h"
25 #include "ash/host/ash_window_tree_host.h" 18 #include "ash/host/ash_window_tree_host.h"
26 #include "ash/magnifier/magnification_controller.h" 19 #include "ash/magnifier/magnification_controller.h"
27 #include "ash/public/cpp/shell_window_ids.h" 20 #include "ash/public/cpp/shell_window_ids.h"
28 #include "ash/root_window_controller.h" 21 #include "ash/root_window_controller.h"
29 #include "ash/rotator/window_rotation.h" 22 #include "ash/rotator/window_rotation.h"
30 #include "ash/screenshot_delegate.h" 23 #include "ash/screenshot_delegate.h"
24 #include "ash/session/session_state_delegate.h"
25 #include "ash/shelf/wm_shelf.h"
31 #include "ash/shell.h" 26 #include "ash/shell.h"
27 #include "ash/shell_delegate.h"
32 #include "ash/system/system_notifier.h" 28 #include "ash/system/system_notifier.h"
33 #include "ash/system/tray/system_tray.h" 29 #include "ash/system/tray/system_tray.h"
34 #include "ash/touch/touch_hud_debug.h" 30 #include "ash/touch/touch_hud_debug.h"
35 #include "ash/utility/screenshot_controller.h" 31 #include "ash/utility/screenshot_controller.h"
32 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
36 #include "ash/wm/power_button_controller.h" 33 #include "ash/wm/power_button_controller.h"
34 #include "ash/wm/window_state.h"
37 #include "ash/wm/window_state_aura.h" 35 #include "ash/wm/window_state_aura.h"
38 #include "ash/wm/window_util.h" 36 #include "ash/wm/window_util.h"
37 #include "ash/wm/wm_event.h"
38 #include "ash/wm_shell.h"
39 #include "base/memory/ptr_util.h" 39 #include "base/memory/ptr_util.h"
40 #include "base/metrics/histogram_macros.h" 40 #include "base/metrics/histogram_macros.h"
41 #include "base/metrics/user_metrics.h" 41 #include "base/metrics/user_metrics.h"
42 #include "base/strings/string_split.h" 42 #include "base/strings/string_split.h"
43 #include "base/strings/utf_string_conversions.h" 43 #include "base/strings/utf_string_conversions.h"
44 #include "base/sys_info.h" 44 #include "base/sys_info.h"
45 #include "third_party/skia/include/core/SkColor.h" 45 #include "third_party/skia/include/core/SkColor.h"
46 #include "ui/base/accelerators/accelerator.h" 46 #include "ui/base/accelerators/accelerator.h"
47 #include "ui/base/l10n/l10n_util.h" 47 #include "ui/base/l10n/l10n_util.h"
48 #include "ui/compositor/layer.h" 48 #include "ui/compositor/layer.h"
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 message_center::NotifierId( 480 message_center::NotifierId(
481 message_center::NotifierId::SYSTEM_COMPONENT, 481 message_center::NotifierId::SYSTEM_COMPONENT,
482 system_notifier::kNotifierDeprecatedAccelerator), 482 system_notifier::kNotifierDeprecatedAccelerator),
483 message_center::RichNotificationData(), 483 message_center::RichNotificationData(),
484 new DeprecatedAcceleratorNotificationDelegate)); 484 new DeprecatedAcceleratorNotificationDelegate));
485 message_center::MessageCenter::Get()->AddNotification( 485 message_center::MessageCenter::Get()->AddNotification(
486 std::move(notification)); 486 std::move(notification));
487 } 487 }
488 488
489 } // namespace ash 489 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_delegate_aura.h ('k') | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698