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 <string> | 9 #include <string> |
10 | 10 |
(...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
883 case ACCESSIBLE_FOCUS_NEXT: | 883 case ACCESSIBLE_FOCUS_NEXT: |
884 case ACCESSIBLE_FOCUS_PREVIOUS: | 884 case ACCESSIBLE_FOCUS_PREVIOUS: |
885 return CanHandleAccessibleFocusCycle(); | 885 return CanHandleAccessibleFocusCycle(); |
886 case DEBUG_PRINT_LAYER_HIERARCHY: | 886 case DEBUG_PRINT_LAYER_HIERARCHY: |
887 case DEBUG_PRINT_VIEW_HIERARCHY: | 887 case DEBUG_PRINT_VIEW_HIERARCHY: |
888 case DEBUG_PRINT_WINDOW_HIERARCHY: | 888 case DEBUG_PRINT_WINDOW_HIERARCHY: |
889 case DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE: | 889 case DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE: |
890 case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR: | 890 case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR: |
891 case DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN: | 891 case DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN: |
892 case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS: | 892 case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS: |
893 case DEBUG_TOGGLE_SHOW_DATASAVER_PROMPT: | |
Daniel Erat
2015/03/23 03:49:20
nit: keep this list alphabetized
Greg Levin
2015/03/24 20:35:32
Done, and thanks (it was alphabetized until I rena
| |
893 case DEBUG_TOGGLE_SHOW_FPS_COUNTER: | 894 case DEBUG_TOGGLE_SHOW_FPS_COUNTER: |
894 case DEBUG_TOGGLE_SHOW_PAINT_RECTS: | 895 case DEBUG_TOGGLE_SHOW_PAINT_RECTS: |
895 return debug::DebugAcceleratorsEnabled(); | 896 return debug::DebugAcceleratorsEnabled(); |
896 case MAGNIFY_SCREEN_ZOOM_IN: | 897 case MAGNIFY_SCREEN_ZOOM_IN: |
897 case MAGNIFY_SCREEN_ZOOM_OUT: | 898 case MAGNIFY_SCREEN_ZOOM_OUT: |
898 return CanHandleMagnifyScreen(); | 899 return CanHandleMagnifyScreen(); |
899 case NEW_INCOGNITO_WINDOW: | 900 case NEW_INCOGNITO_WINDOW: |
900 return CanHandleNewIncognitoWindow(); | 901 return CanHandleNewIncognitoWindow(); |
901 case NEXT_IME: | 902 case NEXT_IME: |
902 return CanHandleNextIme(ime_control_delegate_.get(), | 903 return CanHandleNextIme(ime_control_delegate_.get(), |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1025 case CYCLE_FORWARD_MRU: | 1026 case CYCLE_FORWARD_MRU: |
1026 HandleCycleForwardMRU(accelerator); | 1027 HandleCycleForwardMRU(accelerator); |
1027 break; | 1028 break; |
1028 case DEBUG_PRINT_LAYER_HIERARCHY: | 1029 case DEBUG_PRINT_LAYER_HIERARCHY: |
1029 case DEBUG_PRINT_VIEW_HIERARCHY: | 1030 case DEBUG_PRINT_VIEW_HIERARCHY: |
1030 case DEBUG_PRINT_WINDOW_HIERARCHY: | 1031 case DEBUG_PRINT_WINDOW_HIERARCHY: |
1031 case DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE: | 1032 case DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE: |
1032 case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR: | 1033 case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR: |
1033 case DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN: | 1034 case DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN: |
1034 case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS: | 1035 case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS: |
1036 case DEBUG_TOGGLE_SHOW_DATASAVER_PROMPT: | |
Daniel Erat
2015/03/23 03:49:20
same here
Greg Levin
2015/03/24 20:35:32
Done.
| |
1035 case DEBUG_TOGGLE_SHOW_FPS_COUNTER: | 1037 case DEBUG_TOGGLE_SHOW_FPS_COUNTER: |
1036 case DEBUG_TOGGLE_SHOW_PAINT_RECTS: | 1038 case DEBUG_TOGGLE_SHOW_PAINT_RECTS: |
1037 debug::PerformDebugActionIfEnabled(action); | 1039 debug::PerformDebugActionIfEnabled(action); |
1038 break; | 1040 break; |
1039 case EXIT: | 1041 case EXIT: |
1040 // UMA metrics are recorded in the handler. | 1042 // UMA metrics are recorded in the handler. |
1041 exit_warning_handler_.HandleAccelerator(); | 1043 exit_warning_handler_.HandleAccelerator(); |
1042 break; | 1044 break; |
1043 case FOCUS_NEXT_PANE: | 1045 case FOCUS_NEXT_PANE: |
1044 HandleRotatePaneFocus(Shell::FORWARD); | 1046 HandleRotatePaneFocus(Shell::FORWARD); |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1328 } | 1330 } |
1329 | 1331 |
1330 void AcceleratorController::SetKeyboardBrightnessControlDelegate( | 1332 void AcceleratorController::SetKeyboardBrightnessControlDelegate( |
1331 scoped_ptr<KeyboardBrightnessControlDelegate> | 1333 scoped_ptr<KeyboardBrightnessControlDelegate> |
1332 keyboard_brightness_control_delegate) { | 1334 keyboard_brightness_control_delegate) { |
1333 keyboard_brightness_control_delegate_ = | 1335 keyboard_brightness_control_delegate_ = |
1334 keyboard_brightness_control_delegate.Pass(); | 1336 keyboard_brightness_control_delegate.Pass(); |
1335 } | 1337 } |
1336 | 1338 |
1337 } // namespace ash | 1339 } // namespace ash |
OLD | NEW |