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

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

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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/common/ash_switches.h » ('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 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/common/accelerators/debug_commands.h"
14 #include "ash/common/accessibility_types.h" 14 #include "ash/common/accessibility_types.h"
15 #include "ash/common/ash_switches.h"
16 #include "ash/common/gpu_support.h" 15 #include "ash/common/gpu_support.h"
17 #include "ash/common/session/session_state_delegate.h" 16 #include "ash/common/session/session_state_delegate.h"
18 #include "ash/common/shelf/wm_shelf.h" 17 #include "ash/common/shelf/wm_shelf.h"
19 #include "ash/common/shell_delegate.h" 18 #include "ash/common/shell_delegate.h"
20 #include "ash/common/shell_window_ids.h" 19 #include "ash/common/shell_window_ids.h"
21 #include "ash/common/system/system_notifier.h" 20 #include "ash/common/system/system_notifier.h"
22 #include "ash/common/system/tray/system_tray.h" 21 #include "ash/common/system/tray/system_tray.h"
23 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 22 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
24 #include "ash/common/wm/window_state.h" 23 #include "ash/common/wm/window_state.h"
25 #include "ash/common/wm/wm_event.h" 24 #include "ash/common/wm/wm_event.h"
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 message_center::NotifierId( 495 message_center::NotifierId(
497 message_center::NotifierId::SYSTEM_COMPONENT, 496 message_center::NotifierId::SYSTEM_COMPONENT,
498 system_notifier::kNotifierDeprecatedAccelerator), 497 system_notifier::kNotifierDeprecatedAccelerator),
499 message_center::RichNotificationData(), 498 message_center::RichNotificationData(),
500 new DeprecatedAcceleratorNotificationDelegate)); 499 new DeprecatedAcceleratorNotificationDelegate));
501 message_center::MessageCenter::Get()->AddNotification( 500 message_center::MessageCenter::Get()->AddNotification(
502 std::move(notification)); 501 std::move(notification));
503 } 502 }
504 503
505 } // namespace ash 504 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/common/ash_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698