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/common/accelerators/accelerator_controller.h" | 5 #include "ash/common/accelerators/accelerator_controller.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "ash/common/accelerators/accelerator_commands.h" | 9 #include "ash/common/accelerators/accelerator_commands.h" |
8 #include "ash/common/accelerators/accelerator_controller_delegate.h" | 10 #include "ash/common/accelerators/accelerator_controller_delegate.h" |
9 #include "ash/common/accelerators/debug_commands.h" | 11 #include "ash/common/accelerators/debug_commands.h" |
10 #include "ash/common/accessibility_delegate.h" | 12 #include "ash/common/accessibility_delegate.h" |
11 #include "ash/common/accessibility_types.h" | 13 #include "ash/common/accessibility_types.h" |
12 #include "ash/common/focus_cycler.h" | 14 #include "ash/common/focus_cycler.h" |
13 #include "ash/common/ime_control_delegate.h" | 15 #include "ash/common/ime_control_delegate.h" |
14 #include "ash/common/media_delegate.h" | 16 #include "ash/common/media_delegate.h" |
15 #include "ash/common/multi_profile_uma.h" | 17 #include "ash/common/multi_profile_uma.h" |
16 #include "ash/common/session/session_state_delegate.h" | 18 #include "ash/common/session/session_state_delegate.h" |
(...skipping 11 matching lines...) Expand all Loading... |
28 #include "ash/common/wm/window_cycle_controller.h" | 30 #include "ash/common/wm/window_cycle_controller.h" |
29 #include "ash/common/wm/window_positioning_utils.h" | 31 #include "ash/common/wm/window_positioning_utils.h" |
30 #include "ash/common/wm/window_state.h" | 32 #include "ash/common/wm/window_state.h" |
31 #include "ash/common/wm/wm_event.h" | 33 #include "ash/common/wm/wm_event.h" |
32 #include "ash/common/wm_root_window_controller.h" | 34 #include "ash/common/wm_root_window_controller.h" |
33 #include "ash/common/wm_shell.h" | 35 #include "ash/common/wm_shell.h" |
34 #include "ash/common/wm_window.h" | 36 #include "ash/common/wm_window.h" |
35 #include "ash/public/interfaces/new_window.mojom.h" | 37 #include "ash/public/interfaces/new_window.mojom.h" |
36 #include "base/metrics/histogram_macros.h" | 38 #include "base/metrics/histogram_macros.h" |
37 #include "base/metrics/user_metrics.h" | 39 #include "base/metrics/user_metrics.h" |
38 #include "content/public/common/service_names.mojom.h" | |
39 #include "services/service_manager/public/cpp/connector.h" | |
40 #include "ui/base/accelerators/accelerator.h" | 40 #include "ui/base/accelerators/accelerator.h" |
41 #include "ui/base/accelerators/accelerator_manager.h" | 41 #include "ui/base/accelerators/accelerator_manager.h" |
42 #include "ui/keyboard/keyboard_controller.h" | 42 #include "ui/keyboard/keyboard_controller.h" |
43 | 43 |
44 #if defined(OS_CHROMEOS) | 44 #if defined(OS_CHROMEOS) |
45 #include "ash/common/palette_delegate.h" | 45 #include "ash/common/palette_delegate.h" |
46 #include "ash/common/shelf/wm_shelf.h" | 46 #include "ash/common/shelf/wm_shelf.h" |
47 #include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h" | 47 #include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h" |
48 #include "ash/common/system/chromeos/palette/palette_tray.h" | 48 #include "ash/common/system/chromeos/palette/palette_tray.h" |
49 #include "ash/common/system/chromeos/palette/palette_utils.h" | 49 #include "ash/common/system/chromeos/palette/palette_utils.h" |
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 WmShell::Get()->accessibility_delegate()->ToggleHighContrast(); | 501 WmShell::Get()->accessibility_delegate()->ToggleHighContrast(); |
502 } | 502 } |
503 | 503 |
504 void HandleToggleSpokenFeedback() { | 504 void HandleToggleSpokenFeedback() { |
505 base::RecordAction(UserMetricsAction("Accel_Toggle_Spoken_Feedback")); | 505 base::RecordAction(UserMetricsAction("Accel_Toggle_Spoken_Feedback")); |
506 | 506 |
507 WmShell::Get()->accessibility_delegate()->ToggleSpokenFeedback( | 507 WmShell::Get()->accessibility_delegate()->ToggleSpokenFeedback( |
508 A11Y_NOTIFICATION_SHOW); | 508 A11Y_NOTIFICATION_SHOW); |
509 } | 509 } |
510 | 510 |
511 void HandleVolumeDown(mojom::VolumeController* volume_controller, | 511 void HandleVolumeDown(mojom::VolumeClient* volume_client, |
512 const ui::Accelerator& accelerator) { | 512 const ui::Accelerator& accelerator) { |
513 if (accelerator.key_code() == ui::VKEY_VOLUME_DOWN) | 513 if (accelerator.key_code() == ui::VKEY_VOLUME_DOWN) |
514 base::RecordAction(UserMetricsAction("Accel_VolumeDown_F9")); | 514 base::RecordAction(UserMetricsAction("Accel_VolumeDown_F9")); |
515 | 515 |
516 if (volume_controller) | 516 if (volume_client) |
517 volume_controller->VolumeDown(); | 517 volume_client->VolumeDown(); |
518 } | 518 } |
519 | 519 |
520 void HandleVolumeMute(mojom::VolumeController* volume_controller, | 520 void HandleVolumeMute(mojom::VolumeClient* volume_client, |
521 const ui::Accelerator& accelerator) { | 521 const ui::Accelerator& accelerator) { |
522 if (accelerator.key_code() == ui::VKEY_VOLUME_MUTE) | 522 if (accelerator.key_code() == ui::VKEY_VOLUME_MUTE) |
523 base::RecordAction(UserMetricsAction("Accel_VolumeMute_F8")); | 523 base::RecordAction(UserMetricsAction("Accel_VolumeMute_F8")); |
524 | 524 |
525 if (volume_controller) | 525 if (volume_client) |
526 volume_controller->VolumeMute(); | 526 volume_client->VolumeMute(); |
527 } | 527 } |
528 | 528 |
529 void HandleVolumeUp(mojom::VolumeController* volume_controller, | 529 void HandleVolumeUp(mojom::VolumeClient* volume_client, |
530 const ui::Accelerator& accelerator) { | 530 const ui::Accelerator& accelerator) { |
531 if (accelerator.key_code() == ui::VKEY_VOLUME_UP) | 531 if (accelerator.key_code() == ui::VKEY_VOLUME_UP) |
532 base::RecordAction(UserMetricsAction("Accel_VolumeUp_F10")); | 532 base::RecordAction(UserMetricsAction("Accel_VolumeUp_F10")); |
533 | 533 |
534 if (volume_controller) | 534 if (volume_client) |
535 volume_controller->VolumeUp(); | 535 volume_client->VolumeUp(); |
536 } | 536 } |
537 | 537 |
538 #endif // defined(OS_CHROMEOS) | 538 #endif // defined(OS_CHROMEOS) |
539 | 539 |
540 } // namespace | 540 } // namespace |
541 | 541 |
542 //////////////////////////////////////////////////////////////////////////////// | 542 //////////////////////////////////////////////////////////////////////////////// |
543 // AcceleratorController, public: | 543 // AcceleratorController, public: |
544 | 544 |
545 AcceleratorController::AcceleratorController( | 545 AcceleratorController::AcceleratorController( |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
677 PerformAction(action, accelerator); | 677 PerformAction(action, accelerator); |
678 return ShouldActionConsumeKeyEvent(action); | 678 return ShouldActionConsumeKeyEvent(action); |
679 } | 679 } |
680 return false; | 680 return false; |
681 } | 681 } |
682 | 682 |
683 bool AcceleratorController::CanHandleAccelerators() const { | 683 bool AcceleratorController::CanHandleAccelerators() const { |
684 return true; | 684 return true; |
685 } | 685 } |
686 | 686 |
| 687 void AcceleratorController::BindRequest(mojom::VolumeRequest request) { |
| 688 bindings_.AddBinding(this, std::move(request)); |
| 689 } |
| 690 |
| 691 void AcceleratorController::SetClient(mojom::VolumeClientPtr client) { |
| 692 volume_client_ = std::move(client); |
| 693 } |
| 694 |
687 /////////////////////////////////////////////////////////////////////////////// | 695 /////////////////////////////////////////////////////////////////////////////// |
688 // AcceleratorController, private: | 696 // AcceleratorController, private: |
689 | 697 |
690 void AcceleratorController::Init() { | 698 void AcceleratorController::Init() { |
691 for (size_t i = 0; i < kActionsAllowedAtLoginOrLockScreenLength; ++i) { | 699 for (size_t i = 0; i < kActionsAllowedAtLoginOrLockScreenLength; ++i) { |
692 actions_allowed_at_login_screen_.insert( | 700 actions_allowed_at_login_screen_.insert( |
693 kActionsAllowedAtLoginOrLockScreen[i]); | 701 kActionsAllowedAtLoginOrLockScreen[i]); |
694 actions_allowed_at_lock_screen_.insert( | 702 actions_allowed_at_lock_screen_.insert( |
695 kActionsAllowedAtLoginOrLockScreen[i]); | 703 kActionsAllowedAtLoginOrLockScreen[i]); |
696 } | 704 } |
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1088 case TOGGLE_HIGH_CONTRAST: | 1096 case TOGGLE_HIGH_CONTRAST: |
1089 HandleToggleHighContrast(); | 1097 HandleToggleHighContrast(); |
1090 break; | 1098 break; |
1091 case TOGGLE_SPOKEN_FEEDBACK: | 1099 case TOGGLE_SPOKEN_FEEDBACK: |
1092 HandleToggleSpokenFeedback(); | 1100 HandleToggleSpokenFeedback(); |
1093 break; | 1101 break; |
1094 case TOGGLE_WIFI: | 1102 case TOGGLE_WIFI: |
1095 WmShell::Get()->system_tray_notifier()->NotifyRequestToggleWifi(); | 1103 WmShell::Get()->system_tray_notifier()->NotifyRequestToggleWifi(); |
1096 break; | 1104 break; |
1097 case VOLUME_DOWN: | 1105 case VOLUME_DOWN: |
1098 HandleVolumeDown(GetVolumeController(), accelerator); | 1106 HandleVolumeDown(volume_client_.get(), accelerator); |
1099 break; | 1107 break; |
1100 case VOLUME_MUTE: | 1108 case VOLUME_MUTE: |
1101 HandleVolumeMute(GetVolumeController(), accelerator); | 1109 HandleVolumeMute(volume_client_.get(), accelerator); |
1102 break; | 1110 break; |
1103 case VOLUME_UP: | 1111 case VOLUME_UP: |
1104 HandleVolumeUp(GetVolumeController(), accelerator); | 1112 HandleVolumeUp(volume_client_.get(), accelerator); |
1105 break; | 1113 break; |
1106 #else | 1114 #else |
1107 case DUMMY_FOR_RESERVED: | 1115 case DUMMY_FOR_RESERVED: |
1108 NOTREACHED(); | 1116 NOTREACHED(); |
1109 break; | 1117 break; |
1110 #endif | 1118 #endif |
1111 default: | 1119 default: |
1112 // Temporary until mash transition complete. Needed as some actions | 1120 // Temporary until mash transition complete. Needed as some actions |
1113 // don't yet work with mash. | 1121 // don't yet work with mash. |
1114 DCHECK(delegate_ && delegate_->HandlesAction(action)); | 1122 DCHECK(delegate_ && delegate_->HandlesAction(action)); |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1157 } | 1165 } |
1158 if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() && | 1166 if (wm_shell->mru_window_tracker()->BuildMruWindowList().empty() && |
1159 actions_needing_window_.find(action) != actions_needing_window_.end()) { | 1167 actions_needing_window_.find(action) != actions_needing_window_.end()) { |
1160 wm_shell->accessibility_delegate()->TriggerAccessibilityAlert( | 1168 wm_shell->accessibility_delegate()->TriggerAccessibilityAlert( |
1161 A11Y_ALERT_WINDOW_NEEDED); | 1169 A11Y_ALERT_WINDOW_NEEDED); |
1162 return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION; | 1170 return RESTRICTION_PREVENT_PROCESSING_AND_PROPAGATION; |
1163 } | 1171 } |
1164 return RESTRICTION_NONE; | 1172 return RESTRICTION_NONE; |
1165 } | 1173 } |
1166 | 1174 |
1167 mojom::VolumeController* AcceleratorController::GetVolumeController() { | |
1168 if (!volume_controller_ && WmShell::Get()->delegate()->GetShellConnector()) { | |
1169 WmShell::Get()->delegate()->GetShellConnector()->ConnectToInterface( | |
1170 content::mojom::kBrowserServiceName, &volume_controller_); | |
1171 volume_controller_.set_connection_error_handler( | |
1172 base::Bind(&AcceleratorController::OnVolumeControllerConnectionError, | |
1173 base::Unretained(this))); | |
1174 } | |
1175 return volume_controller_.get(); | |
1176 } | |
1177 | |
1178 void AcceleratorController::OnVolumeControllerConnectionError() { | |
1179 volume_controller_.reset(); | |
1180 } | |
1181 | |
1182 } // namespace ash | 1175 } // namespace ash |
OLD | NEW |