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

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

Issue 1261693004: Allow dynamic enabling/disabling of unified desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 10
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 return CanHandleSwitchIme(ime_control_delegate_.get(), accelerator); 844 return CanHandleSwitchIme(ime_control_delegate_.get(), accelerator);
845 case TOGGLE_APP_LIST: 845 case TOGGLE_APP_LIST:
846 return CanHandleToggleAppList(accelerator, previous_accelerator); 846 return CanHandleToggleAppList(accelerator, previous_accelerator);
847 case WINDOW_CYCLE_SNAP_DOCK_LEFT: 847 case WINDOW_CYCLE_SNAP_DOCK_LEFT:
848 case WINDOW_CYCLE_SNAP_DOCK_RIGHT: 848 case WINDOW_CYCLE_SNAP_DOCK_RIGHT:
849 return CanHandleWindowSnapOrDock(); 849 return CanHandleWindowSnapOrDock();
850 case WINDOW_POSITION_CENTER: 850 case WINDOW_POSITION_CENTER:
851 return CanHandlePositionCenter(); 851 return CanHandlePositionCenter();
852 #if defined(OS_CHROMEOS) 852 #if defined(OS_CHROMEOS)
853 case DEBUG_ADD_REMOVE_DISPLAY: 853 case DEBUG_ADD_REMOVE_DISPLAY:
854 case DEBUG_TOGGLE_UNIFIED_DESKTOP:
854 return debug::DebugAcceleratorsEnabled(); 855 return debug::DebugAcceleratorsEnabled();
855 case DISABLE_CAPS_LOCK: 856 case DISABLE_CAPS_LOCK:
856 return CanHandleDisableCapsLock(previous_accelerator); 857 return CanHandleDisableCapsLock(previous_accelerator);
857 case SILENCE_SPOKEN_FEEDBACK: 858 case SILENCE_SPOKEN_FEEDBACK:
858 return CanHandleSilenceSpokenFeedback(); 859 return CanHandleSilenceSpokenFeedback();
859 case SWITCH_TO_PREVIOUS_USER: 860 case SWITCH_TO_PREVIOUS_USER:
860 case SWITCH_TO_NEXT_USER: 861 case SWITCH_TO_NEXT_USER:
861 return CanHandleCycleUser(); 862 return CanHandleCycleUser();
862 case TOGGLE_CAPS_LOCK: 863 case TOGGLE_CAPS_LOCK:
863 return CanHandleToggleCapsLock(accelerator, previous_accelerator); 864 return CanHandleToggleCapsLock(accelerator, previous_accelerator);
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 #if defined(OS_CHROMEOS) 1101 #if defined(OS_CHROMEOS)
1101 case BRIGHTNESS_DOWN: 1102 case BRIGHTNESS_DOWN:
1102 HandleBrightnessDown(brightness_control_delegate_.get(), accelerator); 1103 HandleBrightnessDown(brightness_control_delegate_.get(), accelerator);
1103 break; 1104 break;
1104 case BRIGHTNESS_UP: 1105 case BRIGHTNESS_UP:
1105 HandleBrightnessUp(brightness_control_delegate_.get(), accelerator); 1106 HandleBrightnessUp(brightness_control_delegate_.get(), accelerator);
1106 break; 1107 break;
1107 case DEBUG_ADD_REMOVE_DISPLAY: 1108 case DEBUG_ADD_REMOVE_DISPLAY:
1108 debug::PerformDebugActionIfEnabled(action); 1109 debug::PerformDebugActionIfEnabled(action);
1109 break; 1110 break;
1111 case DEBUG_TOGGLE_UNIFIED_DESKTOP:
1112 debug::PerformDebugActionIfEnabled(action);
1113 break;
1110 case DISABLE_CAPS_LOCK: 1114 case DISABLE_CAPS_LOCK:
1111 HandleDisableCapsLock(); 1115 HandleDisableCapsLock();
1112 break; 1116 break;
1113 case DISABLE_GPU_WATCHDOG: 1117 case DISABLE_GPU_WATCHDOG:
1114 Shell::GetInstance()->gpu_support()->DisableGpuWatchdog(); 1118 Shell::GetInstance()->gpu_support()->DisableGpuWatchdog();
1115 break; 1119 break;
1116 case KEYBOARD_BRIGHTNESS_DOWN: 1120 case KEYBOARD_BRIGHTNESS_DOWN:
1117 HandleKeyboardBrightnessDown(keyboard_brightness_control_delegate_.get(), 1121 HandleKeyboardBrightnessDown(keyboard_brightness_control_delegate_.get(),
1118 accelerator); 1122 accelerator);
1119 break; 1123 break;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 } 1256 }
1253 1257
1254 void AcceleratorController::SetKeyboardBrightnessControlDelegate( 1258 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
1255 scoped_ptr<KeyboardBrightnessControlDelegate> 1259 scoped_ptr<KeyboardBrightnessControlDelegate>
1256 keyboard_brightness_control_delegate) { 1260 keyboard_brightness_control_delegate) {
1257 keyboard_brightness_control_delegate_ = 1261 keyboard_brightness_control_delegate_ =
1258 keyboard_brightness_control_delegate.Pass(); 1262 keyboard_brightness_control_delegate.Pass();
1259 } 1263 }
1260 1264
1261 } // namespace ash 1265 } // 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