Chromium Code Reviews| 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 <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 419 } | 419 } |
| 420 | 420 |
| 421 bool HandleShowTaskManager() { | 421 bool HandleShowTaskManager() { |
| 422 base::RecordAction(UserMetricsAction("Accel_Show_Task_Manager")); | 422 base::RecordAction(UserMetricsAction("Accel_Show_Task_Manager")); |
| 423 Shell::GetInstance()->new_window_delegate()->ShowTaskManager(); | 423 Shell::GetInstance()->new_window_delegate()->ShowTaskManager(); |
| 424 return true; | 424 return true; |
| 425 } | 425 } |
| 426 | 426 |
| 427 #if defined(OS_CHROMEOS) | 427 #if defined(OS_CHROMEOS) |
| 428 void HandleSilenceSpokenFeedback() { | 428 void HandleSilenceSpokenFeedback() { |
| 429 LOG(ERROR) << "In HandleSilenceSpokenFeedback"; | |
|
dmazzoni
2014/07/31 20:44:43
Delete this?
lisayin
2014/08/06 17:23:59
Done.
| |
| 429 base::RecordAction(UserMetricsAction("Accel_Silence_Spoken_Feedback")); | 430 base::RecordAction(UserMetricsAction("Accel_Silence_Spoken_Feedback")); |
| 430 | 431 |
| 431 AccessibilityDelegate* delegate = | 432 AccessibilityDelegate* delegate = |
| 432 Shell::GetInstance()->accessibility_delegate(); | 433 Shell::GetInstance()->accessibility_delegate(); |
| 433 if (!delegate->IsSpokenFeedbackEnabled()) | 434 if (!delegate->IsSpokenFeedbackEnabled()) |
| 434 return; | 435 return; |
| 435 delegate->SilenceSpokenFeedback(); | 436 delegate->SilenceSpokenFeedback(); |
| 436 } | 437 } |
| 437 #endif | 438 #endif |
| 438 | 439 |
| (...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1202 keyboard_brightness_control_delegate) { | 1203 keyboard_brightness_control_delegate) { |
| 1203 keyboard_brightness_control_delegate_ = | 1204 keyboard_brightness_control_delegate_ = |
| 1204 keyboard_brightness_control_delegate.Pass(); | 1205 keyboard_brightness_control_delegate.Pass(); |
| 1205 } | 1206 } |
| 1206 | 1207 |
| 1207 bool AcceleratorController::CanHandleAccelerators() const { | 1208 bool AcceleratorController::CanHandleAccelerators() const { |
| 1208 return true; | 1209 return true; |
| 1209 } | 1210 } |
| 1210 | 1211 |
| 1211 } // namespace ash | 1212 } // namespace ash |
| OLD | NEW |