| 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_table.h" | 5 #include "ash/accelerators/accelerator_table.h" |
| 6 | 6 |
| 7 #include "ash/strings/grit/ash_strings.h" | 7 #include "ash/strings/grit/ash_strings.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 IDS_SHORTCUT_TASK_MANAGER_OLD, | 239 IDS_SHORTCUT_TASK_MANAGER_OLD, |
| 240 IDS_SHORTCUT_TASK_MANAGER_NEW, | 240 IDS_SHORTCUT_TASK_MANAGER_NEW, |
| 241 true | 241 true |
| 242 }, | 242 }, |
| 243 { | 243 { |
| 244 NEXT_IME, | 244 NEXT_IME, |
| 245 "Ash.Accelerators.Deprecated.NextIME", | 245 "Ash.Accelerators.Deprecated.NextIME", |
| 246 IDS_DEPRECATED_NEXT_IME_MSG, | 246 IDS_DEPRECATED_NEXT_IME_MSG, |
| 247 IDS_SHORTCUT_NEXT_IME_OLD, | 247 IDS_SHORTCUT_NEXT_IME_OLD, |
| 248 IDS_SHORTCUT_NEXT_IME_NEW, | 248 IDS_SHORTCUT_NEXT_IME_NEW, |
| 249 true | 249 false // Old accelerator has been disabled. |
| 250 } | 250 } |
| 251 }; | 251 }; |
| 252 | 252 |
| 253 const size_t kDeprecatedAcceleratorsDataLength = | 253 const size_t kDeprecatedAcceleratorsDataLength = |
| 254 arraysize(kDeprecatedAcceleratorsData); | 254 arraysize(kDeprecatedAcceleratorsData); |
| 255 | 255 |
| 256 #endif // defined(OS_CHROMEOS) | 256 #endif // defined(OS_CHROMEOS) |
| 257 | 257 |
| 258 const AcceleratorData kDebugAcceleratorData[] = { | 258 const AcceleratorData kDebugAcceleratorData[] = { |
| 259 #if defined(OS_CHROMEOS) | 259 #if defined(OS_CHROMEOS) |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 TOGGLE_WIFI, | 557 TOGGLE_WIFI, |
| 558 VOLUME_DOWN, | 558 VOLUME_DOWN, |
| 559 VOLUME_MUTE, | 559 VOLUME_MUTE, |
| 560 VOLUME_UP, | 560 VOLUME_UP, |
| 561 #endif // defined(OS_CHROMEOS) | 561 #endif // defined(OS_CHROMEOS) |
| 562 }; | 562 }; |
| 563 | 563 |
| 564 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 564 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 565 | 565 |
| 566 } // namespace ash | 566 } // namespace ash |
| OLD | NEW |