| 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" | 24 #include "ash/launcher/launcher_model.h" |
| 25 #include "ash/magnifier/magnification_controller.h" | 25 #include "ash/magnifier/magnification_controller.h" |
| 26 #include "ash/magnifier/partial_magnification_controller.h" | 26 #include "ash/magnifier/partial_magnification_controller.h" |
| 27 #include "ash/multi_profile_uma.h" |
| 27 #include "ash/root_window_controller.h" | 28 #include "ash/root_window_controller.h" |
| 28 #include "ash/rotator/screen_rotation.h" | 29 #include "ash/rotator/screen_rotation.h" |
| 29 #include "ash/screenshot_delegate.h" | 30 #include "ash/screenshot_delegate.h" |
| 30 #include "ash/session_state_delegate.h" | 31 #include "ash/session_state_delegate.h" |
| 31 #include "ash/shelf/shelf_widget.h" | 32 #include "ash/shelf/shelf_widget.h" |
| 32 #include "ash/shell.h" | 33 #include "ash/shell.h" |
| 33 #include "ash/shell_delegate.h" | 34 #include "ash/shell_delegate.h" |
| 34 #include "ash/shell_window_ids.h" | 35 #include "ash/shell_window_ids.h" |
| 35 #include "ash/system/brightness_control_delegate.h" | 36 #include "ash/system/brightness_control_delegate.h" |
| 36 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h" | 37 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h" |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 } | 191 } |
| 191 | 192 |
| 192 bool SwitchToNextUser() { | 193 bool SwitchToNextUser() { |
| 193 if (!Shell::GetInstance()->delegate()->IsMultiProfilesEnabled() || | 194 if (!Shell::GetInstance()->delegate()->IsMultiProfilesEnabled() || |
| 194 !ash::switches::ShowMultiProfileShelfMenu()) | 195 !ash::switches::ShowMultiProfileShelfMenu()) |
| 195 return false; | 196 return false; |
| 196 ash::SessionStateDelegate* delegate = | 197 ash::SessionStateDelegate* delegate = |
| 197 ash::Shell::GetInstance()->session_state_delegate(); | 198 ash::Shell::GetInstance()->session_state_delegate(); |
| 198 if (delegate->NumberOfLoggedInUsers() <= 1) | 199 if (delegate->NumberOfLoggedInUsers() <= 1) |
| 199 return false; | 200 return false; |
| 201 MultiProfileUMA::RecordSwitchUserFromAccelerator(); |
| 200 delegate->SwitchActiveUserToNext(); | 202 delegate->SwitchActiveUserToNext(); |
| 201 return true; | 203 return true; |
| 202 } | 204 } |
| 203 | 205 |
| 204 #endif // defined(OS_CHROMEOS) | 206 #endif // defined(OS_CHROMEOS) |
| 205 | 207 |
| 206 bool HandleRotatePaneFocus(Shell::Direction direction) { | 208 bool HandleRotatePaneFocus(Shell::Direction direction) { |
| 207 Shell* shell = Shell::GetInstance(); | 209 Shell* shell = Shell::GetInstance(); |
| 208 switch (direction) { | 210 switch (direction) { |
| 209 case Shell::FORWARD: | 211 case Shell::FORWARD: |
| (...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 981 keyboard_brightness_control_delegate) { | 983 keyboard_brightness_control_delegate) { |
| 982 keyboard_brightness_control_delegate_ = | 984 keyboard_brightness_control_delegate_ = |
| 983 keyboard_brightness_control_delegate.Pass(); | 985 keyboard_brightness_control_delegate.Pass(); |
| 984 } | 986 } |
| 985 | 987 |
| 986 bool AcceleratorController::CanHandleAccelerators() const { | 988 bool AcceleratorController::CanHandleAccelerators() const { |
| 987 return true; | 989 return true; |
| 988 } | 990 } |
| 989 | 991 |
| 990 } // namespace ash | 992 } // namespace ash |
| OLD | NEW |