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

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

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
Patch Set: Created 4 years, 6 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/ash_switches.h" 14 #include "ash/ash_switches.h"
15 #include "ash/common/shelf/shelf_model.h"
15 #include "ash/common/shell_window_ids.h" 16 #include "ash/common/shell_window_ids.h"
16 #include "ash/common/wm/window_state.h" 17 #include "ash/common/wm/window_state.h"
17 #include "ash/common/wm/wm_event.h" 18 #include "ash/common/wm/wm_event.h"
18 #include "ash/debug.h" 19 #include "ash/debug.h"
19 #include "ash/display/window_tree_host_manager.h" 20 #include "ash/display/window_tree_host_manager.h"
20 #include "ash/focus_cycler.h" 21 #include "ash/focus_cycler.h"
21 #include "ash/gpu_support.h" 22 #include "ash/gpu_support.h"
22 #include "ash/ime_control_delegate.h" 23 #include "ash/ime_control_delegate.h"
23 #include "ash/magnifier/magnification_controller.h" 24 #include "ash/magnifier/magnification_controller.h"
24 #include "ash/magnifier/partial_magnification_controller.h" 25 #include "ash/magnifier/partial_magnification_controller.h"
25 #include "ash/media_delegate.h" 26 #include "ash/media_delegate.h"
26 #include "ash/multi_profile_uma.h" 27 #include "ash/multi_profile_uma.h"
27 #include "ash/new_window_delegate.h" 28 #include "ash/new_window_delegate.h"
28 #include "ash/root_window_controller.h" 29 #include "ash/root_window_controller.h"
29 #include "ash/rotator/screen_rotation_animator.h" 30 #include "ash/rotator/screen_rotation_animator.h"
30 #include "ash/rotator/window_rotation.h" 31 #include "ash/rotator/window_rotation.h"
31 #include "ash/screen_util.h" 32 #include "ash/screen_util.h"
32 #include "ash/screenshot_delegate.h" 33 #include "ash/screenshot_delegate.h"
33 #include "ash/session/session_state_delegate.h" 34 #include "ash/session/session_state_delegate.h"
34 #include "ash/shelf/shelf.h" 35 #include "ash/shelf/shelf.h"
35 #include "ash/shelf/shelf_delegate.h" 36 #include "ash/shelf/shelf_delegate.h"
36 #include "ash/shelf/shelf_model.h"
37 #include "ash/shelf/shelf_widget.h" 37 #include "ash/shelf/shelf_widget.h"
38 #include "ash/shell.h" 38 #include "ash/shell.h"
39 #include "ash/shell_delegate.h" 39 #include "ash/shell_delegate.h"
40 #include "ash/system/brightness_control_delegate.h" 40 #include "ash/system/brightness_control_delegate.h"
41 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h" 41 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
42 #include "ash/system/status_area_widget.h" 42 #include "ash/system/status_area_widget.h"
43 #include "ash/system/system_notifier.h" 43 #include "ash/system/system_notifier.h"
44 #include "ash/system/tray/system_tray.h" 44 #include "ash/system/tray/system_tray.h"
45 #include "ash/system/tray/system_tray_delegate.h" 45 #include "ash/system/tray/system_tray_delegate.h"
46 #include "ash/system/tray/system_tray_notifier.h" 46 #include "ash/system/tray/system_tray_notifier.h"
(...skipping 1403 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 } 1450 }
1451 1451
1452 void AcceleratorController::SetKeyboardBrightnessControlDelegate( 1452 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
1453 std::unique_ptr<KeyboardBrightnessControlDelegate> 1453 std::unique_ptr<KeyboardBrightnessControlDelegate>
1454 keyboard_brightness_control_delegate) { 1454 keyboard_brightness_control_delegate) {
1455 keyboard_brightness_control_delegate_ = 1455 keyboard_brightness_control_delegate_ =
1456 std::move(keyboard_brightness_control_delegate); 1456 std::move(keyboard_brightness_control_delegate);
1457 } 1457 }
1458 1458
1459 } // namespace ash 1459 } // 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