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

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

Issue 1759213002: Enable swap primary accelerator only when possible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix winbuild Created 4 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
« no previous file with comments | « no previous file | no next file » | 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>
(...skipping 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 case SWITCH_TO_PREVIOUS_USER: 1043 case SWITCH_TO_PREVIOUS_USER:
1044 case SWITCH_TO_NEXT_USER: 1044 case SWITCH_TO_NEXT_USER:
1045 return CanHandleCycleUser(); 1045 return CanHandleCycleUser();
1046 case TOGGLE_CAPS_LOCK: 1046 case TOGGLE_CAPS_LOCK:
1047 return CanHandleToggleCapsLock(accelerator, previous_accelerator); 1047 return CanHandleToggleCapsLock(accelerator, previous_accelerator);
1048 case TOGGLE_TOUCH_VIEW_TESTING: 1048 case TOGGLE_TOUCH_VIEW_TESTING:
1049 return CanHandleToggleTouchViewTesting(); 1049 return CanHandleToggleTouchViewTesting();
1050 case TOUCH_HUD_CLEAR: 1050 case TOUCH_HUD_CLEAR:
1051 case TOUCH_HUD_MODE_CHANGE: 1051 case TOUCH_HUD_MODE_CHANGE:
1052 return CanHandleTouchHud(); 1052 return CanHandleTouchHud();
1053 case SWAP_PRIMARY_DISPLAY:
1054 return gfx::Screen::GetScreen()->GetNumDisplays() > 1;
1053 #endif 1055 #endif
1054
1055 case CYCLE_BACKWARD_MRU: 1056 case CYCLE_BACKWARD_MRU:
1056 case CYCLE_FORWARD_MRU: 1057 case CYCLE_FORWARD_MRU:
1057 case EXIT: 1058 case EXIT:
1058 case FOCUS_NEXT_PANE: 1059 case FOCUS_NEXT_PANE:
1059 case FOCUS_PREVIOUS_PANE: 1060 case FOCUS_PREVIOUS_PANE:
1060 case FOCUS_SHELF: 1061 case FOCUS_SHELF:
1061 case LAUNCH_APP_0: 1062 case LAUNCH_APP_0:
1062 case LAUNCH_APP_1: 1063 case LAUNCH_APP_1:
1063 case LAUNCH_APP_2: 1064 case LAUNCH_APP_2:
1064 case LAUNCH_APP_3: 1065 case LAUNCH_APP_3:
(...skipping 27 matching lines...) Expand all
1092 case DISABLE_GPU_WATCHDOG: 1093 case DISABLE_GPU_WATCHDOG:
1093 case KEYBOARD_BRIGHTNESS_DOWN: 1094 case KEYBOARD_BRIGHTNESS_DOWN:
1094 case KEYBOARD_BRIGHTNESS_UP: 1095 case KEYBOARD_BRIGHTNESS_UP:
1095 case LOCK_PRESSED: 1096 case LOCK_PRESSED:
1096 case LOCK_RELEASED: 1097 case LOCK_RELEASED:
1097 case OPEN_CROSH: 1098 case OPEN_CROSH:
1098 case OPEN_FILE_MANAGER: 1099 case OPEN_FILE_MANAGER:
1099 case OPEN_GET_HELP: 1100 case OPEN_GET_HELP:
1100 case POWER_PRESSED: 1101 case POWER_PRESSED:
1101 case POWER_RELEASED: 1102 case POWER_RELEASED:
1102 case SWAP_PRIMARY_DISPLAY:
1103 case TOGGLE_MIRROR_MODE: 1103 case TOGGLE_MIRROR_MODE:
1104 case TOGGLE_SPOKEN_FEEDBACK: 1104 case TOGGLE_SPOKEN_FEEDBACK:
1105 case TOGGLE_WIFI: 1105 case TOGGLE_WIFI:
1106 case TOUCH_HUD_PROJECTION_TOGGLE: 1106 case TOUCH_HUD_PROJECTION_TOGGLE:
1107 case VOLUME_DOWN: 1107 case VOLUME_DOWN:
1108 case VOLUME_MUTE: 1108 case VOLUME_MUTE:
1109 case VOLUME_UP: 1109 case VOLUME_UP:
1110 #else 1110 #else
1111 case DUMMY_FOR_RESERVED: 1111 case DUMMY_FOR_RESERVED:
1112 #endif 1112 #endif
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
1430 } 1430 }
1431 1431
1432 void AcceleratorController::SetKeyboardBrightnessControlDelegate( 1432 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
1433 scoped_ptr<KeyboardBrightnessControlDelegate> 1433 scoped_ptr<KeyboardBrightnessControlDelegate>
1434 keyboard_brightness_control_delegate) { 1434 keyboard_brightness_control_delegate) {
1435 keyboard_brightness_control_delegate_ = 1435 keyboard_brightness_control_delegate_ =
1436 std::move(keyboard_brightness_control_delegate); 1436 std::move(keyboard_brightness_control_delegate);
1437 } 1437 }
1438 1438
1439 } // namespace ash 1439 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698