| 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> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/accelerators/accelerator_commands.h" | 9 #include "ash/common/accelerators/accelerator_commands.h" |
| 10 #include "ash/common/accelerators/accelerator_controller_delegate.h" | 10 #include "ash/common/accelerators/accelerator_controller_delegate.h" |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 ->accessibility_delegate() | 267 ->accessibility_delegate() |
| 268 ->IsSpokenFeedbackEnabled()) | 268 ->IsSpokenFeedbackEnabled()) |
| 269 return false; | 269 return false; |
| 270 } | 270 } |
| 271 return true; | 271 return true; |
| 272 } | 272 } |
| 273 | 273 |
| 274 void HandleToggleAppList(const ui::Accelerator& accelerator) { | 274 void HandleToggleAppList(const ui::Accelerator& accelerator) { |
| 275 if (accelerator.key_code() == ui::VKEY_LWIN) | 275 if (accelerator.key_code() == ui::VKEY_LWIN) |
| 276 base::RecordAction(UserMetricsAction("Accel_Search_LWin")); | 276 base::RecordAction(UserMetricsAction("Accel_Search_LWin")); |
| 277 WmShell::Get()->ToggleAppList(); | 277 Shell::Get()->ToggleAppList(); |
| 278 } | 278 } |
| 279 | 279 |
| 280 void HandleToggleFullscreen(const ui::Accelerator& accelerator) { | 280 void HandleToggleFullscreen(const ui::Accelerator& accelerator) { |
| 281 if (accelerator.key_code() == ui::VKEY_MEDIA_LAUNCH_APP2) | 281 if (accelerator.key_code() == ui::VKEY_MEDIA_LAUNCH_APP2) |
| 282 base::RecordAction(UserMetricsAction("Accel_Fullscreen_F4")); | 282 base::RecordAction(UserMetricsAction("Accel_Fullscreen_F4")); |
| 283 accelerators::ToggleFullscreen(); | 283 accelerators::ToggleFullscreen(); |
| 284 } | 284 } |
| 285 | 285 |
| 286 void HandleToggleOverview() { | 286 void HandleToggleOverview() { |
| 287 base::RecordAction(base::UserMetricsAction("Accel_Overview_F5")); | 287 base::RecordAction(base::UserMetricsAction("Accel_Overview_F5")); |
| (...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1167 data->old_shortcut_id, data->new_shortcut_id); | 1167 data->old_shortcut_id, data->new_shortcut_id); |
| 1168 } | 1168 } |
| 1169 | 1169 |
| 1170 if (!data->deprecated_enabled) | 1170 if (!data->deprecated_enabled) |
| 1171 return AcceleratorProcessingStatus::STOP; | 1171 return AcceleratorProcessingStatus::STOP; |
| 1172 | 1172 |
| 1173 return AcceleratorProcessingStatus::PROCEED; | 1173 return AcceleratorProcessingStatus::PROCEED; |
| 1174 } | 1174 } |
| 1175 | 1175 |
| 1176 } // namespace ash | 1176 } // namespace ash |
| OLD | NEW |