ash/accelerators/accelerator_controller.cc - Issue 71653003: ash: Rename LauncherModel to ShelfModel.

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

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chrome changes Created 7 years, 1 month 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »

OLD	NEW
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 <iostream>	9 #include <iostream>

10 #include <string>	10 #include <string>

11	11

12 #include "ash/accelerators/accelerator_commands.h"	12 #include "ash/accelerators/accelerator_commands.h"

13 #include "ash/accelerators/accelerator_table.h"	13 #include "ash/accelerators/accelerator_table.h"

14 #include "ash/accelerators/debug_commands.h"	14 #include "ash/accelerators/debug_commands.h"

15 #include "ash/ash_switches.h"	15 #include "ash/ash_switches.h"

16 #include "ash/caps_lock_delegate.h"	16 #include "ash/caps_lock_delegate.h"

17 #include "ash/debug.h"	17 #include "ash/debug.h"

18 #include "ash/display/display_controller.h"	18 #include "ash/display/display_controller.h"

19 #include "ash/display/display_manager.h"	19 #include "ash/display/display_manager.h"

20 #include "ash/focus_cycler.h"	20 #include "ash/focus_cycler.h"

21 #include "ash/ime_control_delegate.h"	21 #include "ash/ime_control_delegate.h"

22 #include "ash/launcher/launcher.h"	22 #include "ash/launcher/launcher.h"

23 #include "ash/launcher/launcher_delegate.h"	23 #include "ash/launcher/launcher_delegate.h"

24 #include "ash/launcher/launcher_model.h"

25 #include "ash/magnifier/magnification_controller.h"	24 #include "ash/magnifier/magnification_controller.h"

26 #include "ash/magnifier/partial_magnification_controller.h"	25 #include "ash/magnifier/partial_magnification_controller.h"

27 #include "ash/media_delegate.h"	26 #include "ash/media_delegate.h"

28 #include "ash/multi_profile_uma.h"	27 #include "ash/multi_profile_uma.h"

29 #include "ash/new_window_delegate.h"	28 #include "ash/new_window_delegate.h"

30 #include "ash/root_window_controller.h"	29 #include "ash/root_window_controller.h"

31 #include "ash/rotator/screen_rotation.h"	30 #include "ash/rotator/screen_rotation.h"

32 #include "ash/screenshot_delegate.h"	31 #include "ash/screenshot_delegate.h"

33 #include "ash/session_state_delegate.h"	32 #include "ash/session_state_delegate.h"

	33 #include "ash/shelf/shelf_model.h"

34 #include "ash/shelf/shelf_widget.h"	34 #include "ash/shelf/shelf_widget.h"

35 #include "ash/shell.h"	35 #include "ash/shell.h"

36 #include "ash/shell_delegate.h"	36 #include "ash/shell_delegate.h"

37 #include "ash/shell_window_ids.h"	37 #include "ash/shell_window_ids.h"

38 #include "ash/system/brightness_control_delegate.h"	38 #include "ash/system/brightness_control_delegate.h"

39 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"	39 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"

40 #include "ash/system/status_area_widget.h"	40 #include "ash/system/status_area_widget.h"

41 #include "ash/system/tray/system_tray.h"	41 #include "ash/system/tray/system_tray.h"

42 #include "ash/system/tray/system_tray_delegate.h"	42 #include "ash/system/tray/system_tray_delegate.h"

43 #include "ash/system/tray/system_tray_notifier.h"	43 #include "ash/system/tray/system_tray_notifier.h"

(...skipping 951 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
995 keyboard_brightness_control_delegate) {	995 keyboard_brightness_control_delegate) {

996 keyboard_brightness_control_delegate_ =	996 keyboard_brightness_control_delegate_ =

997 keyboard_brightness_control_delegate.Pass();	997 keyboard_brightness_control_delegate.Pass();

998 }	998 }

999	999

1000 bool AcceleratorController::CanHandleAccelerators() const {	1000 bool AcceleratorController::CanHandleAccelerators() const {

1001 return true;	1001 return true;

1002 }	1002 }

1003	1003

1004 } // namespace ash	1004 } // namespace ash

OLD	NEW