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

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

Issue 2093573003: Debug shortcut to toggle touch view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments. revert unnecesary change 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/accelerators/accelerator_table.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 (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 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 mirror, true /* user_action */); 694 mirror, true /* user_action */);
695 } 695 }
696 696
697 void HandleToggleSpokenFeedback() { 697 void HandleToggleSpokenFeedback() {
698 base::RecordAction(UserMetricsAction("Accel_Toggle_Spoken_Feedback")); 698 base::RecordAction(UserMetricsAction("Accel_Toggle_Spoken_Feedback"));
699 699
700 Shell::GetInstance()->accessibility_delegate()->ToggleSpokenFeedback( 700 Shell::GetInstance()->accessibility_delegate()->ToggleSpokenFeedback(
701 A11Y_NOTIFICATION_SHOW); 701 A11Y_NOTIFICATION_SHOW);
702 } 702 }
703 703
704 bool CanHandleToggleTouchViewTesting() {
705 return base::CommandLine::ForCurrentProcess()->HasSwitch(
706 switches::kAshEnableTouchViewTesting);
707 }
708
709 void HandleToggleTouchViewTesting() {
710 // TODO(skuhne): This is only temporary! Remove this!
711 MaximizeModeController* controller = Shell::GetInstance()->
712 maximize_mode_controller();
713 controller->EnableMaximizeModeWindowManager(
714 !controller->IsMaximizeModeWindowManagerEnabled());
715 }
716
717 bool CanHandleTouchHud() { 704 bool CanHandleTouchHud() {
718 return RootWindowController::ForTargetRootWindow()->touch_hud_debug(); 705 return RootWindowController::ForTargetRootWindow()->touch_hud_debug();
719 } 706 }
720 707
721 void HandleTouchHudClear() { 708 void HandleTouchHudClear() {
722 RootWindowController::ForTargetRootWindow()->touch_hud_debug()->Clear(); 709 RootWindowController::ForTargetRootWindow()->touch_hud_debug()->Clear();
723 } 710 }
724 711
725 void HandleTouchHudModeChange() { 712 void HandleTouchHudModeChange() {
726 RootWindowController* controller = 713 RootWindowController* controller =
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 case WINDOW_CYCLE_SNAP_DOCK_RIGHT: 1029 case WINDOW_CYCLE_SNAP_DOCK_RIGHT:
1043 return CanHandleWindowSnapOrDock(); 1030 return CanHandleWindowSnapOrDock();
1044 case WINDOW_POSITION_CENTER: 1031 case WINDOW_POSITION_CENTER:
1045 return CanHandlePositionCenter(); 1032 return CanHandlePositionCenter();
1046 case UNPIN: 1033 case UNPIN:
1047 return CanHandleUnpin(); 1034 return CanHandleUnpin();
1048 #if defined(OS_CHROMEOS) 1035 #if defined(OS_CHROMEOS)
1049 case DEBUG_ADD_REMOVE_DISPLAY: 1036 case DEBUG_ADD_REMOVE_DISPLAY:
1050 case DEBUG_TOGGLE_TOUCH_PAD: 1037 case DEBUG_TOGGLE_TOUCH_PAD:
1051 case DEBUG_TOGGLE_TOUCH_SCREEN: 1038 case DEBUG_TOGGLE_TOUCH_SCREEN:
1039 case DEBUG_TOGGLE_TOUCH_VIEW:
1052 case DEBUG_TOGGLE_UNIFIED_DESKTOP: 1040 case DEBUG_TOGGLE_UNIFIED_DESKTOP:
1053 return debug::DebugAcceleratorsEnabled(); 1041 return debug::DebugAcceleratorsEnabled();
1054 case DISABLE_CAPS_LOCK: 1042 case DISABLE_CAPS_LOCK:
1055 return CanHandleDisableCapsLock(previous_accelerator); 1043 return CanHandleDisableCapsLock(previous_accelerator);
1056 case LOCK_SCREEN: 1044 case LOCK_SCREEN:
1057 return CanHandleLock(); 1045 return CanHandleLock();
1058 case SWITCH_TO_PREVIOUS_USER: 1046 case SWITCH_TO_PREVIOUS_USER:
1059 case SWITCH_TO_NEXT_USER: 1047 case SWITCH_TO_NEXT_USER:
1060 return CanHandleCycleUser(); 1048 return CanHandleCycleUser();
1061 case TOGGLE_CAPS_LOCK: 1049 case TOGGLE_CAPS_LOCK:
1062 return CanHandleToggleCapsLock(accelerator, previous_accelerator); 1050 return CanHandleToggleCapsLock(accelerator, previous_accelerator);
1063 case TOGGLE_TOUCH_VIEW_TESTING:
1064 return CanHandleToggleTouchViewTesting();
1065 case TOUCH_HUD_CLEAR: 1051 case TOUCH_HUD_CLEAR:
1066 case TOUCH_HUD_MODE_CHANGE: 1052 case TOUCH_HUD_MODE_CHANGE:
1067 return CanHandleTouchHud(); 1053 return CanHandleTouchHud();
1068 case SWAP_PRIMARY_DISPLAY: 1054 case SWAP_PRIMARY_DISPLAY:
1069 return display::Screen::GetScreen()->GetNumDisplays() > 1; 1055 return display::Screen::GetScreen()->GetNumDisplays() > 1;
1070 #endif 1056 #endif
1071 case CYCLE_BACKWARD_MRU: 1057 case CYCLE_BACKWARD_MRU:
1072 case CYCLE_FORWARD_MRU: 1058 case CYCLE_FORWARD_MRU:
1073 case EXIT: 1059 case EXIT:
1074 case FOCUS_NEXT_PANE: 1060 case FOCUS_NEXT_PANE:
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 #if defined(OS_CHROMEOS) 1292 #if defined(OS_CHROMEOS)
1307 case BRIGHTNESS_DOWN: 1293 case BRIGHTNESS_DOWN:
1308 HandleBrightnessDown(brightness_control_delegate_.get(), accelerator); 1294 HandleBrightnessDown(brightness_control_delegate_.get(), accelerator);
1309 break; 1295 break;
1310 case BRIGHTNESS_UP: 1296 case BRIGHTNESS_UP:
1311 HandleBrightnessUp(brightness_control_delegate_.get(), accelerator); 1297 HandleBrightnessUp(brightness_control_delegate_.get(), accelerator);
1312 break; 1298 break;
1313 case DEBUG_ADD_REMOVE_DISPLAY: 1299 case DEBUG_ADD_REMOVE_DISPLAY:
1314 case DEBUG_TOGGLE_TOUCH_PAD: 1300 case DEBUG_TOGGLE_TOUCH_PAD:
1315 case DEBUG_TOGGLE_TOUCH_SCREEN: 1301 case DEBUG_TOGGLE_TOUCH_SCREEN:
1302 case DEBUG_TOGGLE_TOUCH_VIEW:
1316 case DEBUG_TOGGLE_UNIFIED_DESKTOP: 1303 case DEBUG_TOGGLE_UNIFIED_DESKTOP:
1317 debug::PerformDebugActionIfEnabled(action); 1304 debug::PerformDebugActionIfEnabled(action);
1318 break; 1305 break;
1319 case DISABLE_CAPS_LOCK: 1306 case DISABLE_CAPS_LOCK:
1320 HandleDisableCapsLock(); 1307 HandleDisableCapsLock();
1321 break; 1308 break;
1322 case DISABLE_GPU_WATCHDOG: 1309 case DISABLE_GPU_WATCHDOG:
1323 Shell::GetInstance()->gpu_support()->DisableGpuWatchdog(); 1310 Shell::GetInstance()->gpu_support()->DisableGpuWatchdog();
1324 break; 1311 break;
1325 case KEYBOARD_BRIGHTNESS_DOWN: 1312 case KEYBOARD_BRIGHTNESS_DOWN:
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 break; 1361 break;
1375 case TOGGLE_CAPS_LOCK: 1362 case TOGGLE_CAPS_LOCK:
1376 HandleToggleCapsLock(); 1363 HandleToggleCapsLock();
1377 break; 1364 break;
1378 case TOGGLE_MIRROR_MODE: 1365 case TOGGLE_MIRROR_MODE:
1379 HandleToggleMirrorMode(); 1366 HandleToggleMirrorMode();
1380 break; 1367 break;
1381 case TOGGLE_SPOKEN_FEEDBACK: 1368 case TOGGLE_SPOKEN_FEEDBACK:
1382 HandleToggleSpokenFeedback(); 1369 HandleToggleSpokenFeedback();
1383 break; 1370 break;
1384 case TOGGLE_TOUCH_VIEW_TESTING:
1385 HandleToggleTouchViewTesting();
1386 break;
1387 case TOGGLE_WIFI: 1371 case TOGGLE_WIFI:
1388 Shell::GetInstance()->system_tray_notifier()->NotifyRequestToggleWifi(); 1372 Shell::GetInstance()->system_tray_notifier()->NotifyRequestToggleWifi();
1389 break; 1373 break;
1390 case TOUCH_HUD_CLEAR: 1374 case TOUCH_HUD_CLEAR:
1391 HandleTouchHudClear(); 1375 HandleTouchHudClear();
1392 break; 1376 break;
1393 case TOUCH_HUD_MODE_CHANGE: 1377 case TOUCH_HUD_MODE_CHANGE:
1394 HandleTouchHudModeChange(); 1378 HandleTouchHudModeChange();
1395 break; 1379 break;
1396 case TOUCH_HUD_PROJECTION_TOGGLE: 1380 case TOUCH_HUD_PROJECTION_TOGGLE:
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 } 1445 }
1462 1446
1463 void AcceleratorController::SetKeyboardBrightnessControlDelegate( 1447 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
1464 std::unique_ptr<KeyboardBrightnessControlDelegate> 1448 std::unique_ptr<KeyboardBrightnessControlDelegate>
1465 keyboard_brightness_control_delegate) { 1449 keyboard_brightness_control_delegate) {
1466 keyboard_brightness_control_delegate_ = 1450 keyboard_brightness_control_delegate_ =
1467 std::move(keyboard_brightness_control_delegate); 1451 std::move(keyboard_brightness_control_delegate);
1468 } 1452 }
1469 1453
1470 } // namespace ash 1454 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698