| 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 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ | 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
| 6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ | 6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "ui/events/event_constants.h" | 10 #include "ui/events/event_constants.h" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 147 |
| 148 struct AcceleratorData { | 148 struct AcceleratorData { |
| 149 bool trigger_on_press; | 149 bool trigger_on_press; |
| 150 ui::KeyboardCode keycode; | 150 ui::KeyboardCode keycode; |
| 151 int modifiers; | 151 int modifiers; |
| 152 AcceleratorAction action; | 152 AcceleratorAction action; |
| 153 }; | 153 }; |
| 154 | 154 |
| 155 // Gathers the needed data to handle deprecated accelerators. | 155 // Gathers the needed data to handle deprecated accelerators. |
| 156 struct DeprecatedAcceleratorData { | 156 struct DeprecatedAcceleratorData { |
| 157 // The old deprecated accelerator. | 157 // The action that has deprecated accelerators. |
| 158 AcceleratorData deprecated_accelerator; | 158 AcceleratorAction action; |
| 159 | 159 |
| 160 // The name of the UMA histogram that will be used to measure the deprecated | 160 // The name of the UMA histogram that will be used to measure the deprecated |
| 161 // v.s. new accelerator usage. | 161 // v.s. new accelerator usage. |
| 162 const char* uma_histogram_name; | 162 const char* uma_histogram_name; |
| 163 | 163 |
| 164 // The ID of the localized notification message to show to users informing | 164 // The ID of the localized notification message to show to users informing |
| 165 // them about the deprecation. | 165 // them about the deprecation. |
| 166 int notification_message_id; | 166 int notification_message_id; |
| 167 | 167 |
| 168 // Specifies whether the deprecated accelerator is still enabled to do its | 168 // Specifies whether the deprecated accelerator is still enabled to do its |
| 169 // associated action. | 169 // associated action. |
| 170 bool deprecated_enabled; | 170 bool deprecated_enabled; |
| 171 }; | 171 }; |
| 172 | 172 |
| 173 // This will be used for the UMA stats to measure the how many users are using | 173 // This will be used for the UMA stats to measure the how many users are using |
| 174 // the old v.s. new accelerators. | 174 // the old v.s. new accelerators. |
| 175 enum DeprecatedAcceleratorUsage { | 175 enum DeprecatedAcceleratorUsage { |
| 176 DEPRECATED_USED = 0, // The deprecated accelerator is used. | 176 DEPRECATED_USED = 0, // The deprecated accelerator is used. |
| 177 NEW_USED, // The new accelerator is used. | 177 NEW_USED, // The new accelerator is used. |
| 178 DEPRECATED_USAGE_COUNT, // Maximum value of this enum for histogram use. | 178 DEPRECATED_USAGE_COUNT, // Maximum value of this enum for histogram use. |
| 179 }; | 179 }; |
| 180 | 180 |
| 181 // Accelerators handled by AcceleratorController. | 181 // Accelerators handled by AcceleratorController. |
| 182 ASH_EXPORT extern const AcceleratorData kAcceleratorData[]; | 182 ASH_EXPORT extern const AcceleratorData kAcceleratorData[]; |
| 183 ASH_EXPORT extern const size_t kAcceleratorDataLength; | 183 ASH_EXPORT extern const size_t kAcceleratorDataLength; |
| 184 | 184 |
| 185 #if defined(OS_CHROMEOS) | 185 #if defined(OS_CHROMEOS) |
| 186 // The list of the deprecated accelerators along with their new replacing ones | 186 // The list of the deprecated accelerators. |
| 187 // and how to handle them. | 187 ASH_EXPORT extern const AcceleratorData kDeprecatedAccelerators[]; |
| 188 ASH_EXPORT extern const DeprecatedAcceleratorData kDeprecatedAccelerators[]; | |
| 189 ASH_EXPORT extern const size_t kDeprecatedAcceleratorsLength; | 188 ASH_EXPORT extern const size_t kDeprecatedAcceleratorsLength; |
| 189 |
| 190 // The list of the actions with deprecated accelerators and the needed data to |
| 191 // handle them. |
| 192 ASH_EXPORT extern const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[]; |
| 193 ASH_EXPORT extern const size_t kDeprecatedAcceleratorsDataLength; |
| 190 #endif // defined(OS_CHROMEOS) | 194 #endif // defined(OS_CHROMEOS) |
| 191 | 195 |
| 192 // Debug accelerators. Debug accelerators are only enabled when the "Debugging | 196 // Debug accelerators. Debug accelerators are only enabled when the "Debugging |
| 193 // keyboard shortcuts" flag (--ash-debug-shortcuts) is enabled. Debug actions | 197 // keyboard shortcuts" flag (--ash-debug-shortcuts) is enabled. Debug actions |
| 194 // are always run (similar to reserved actions). | 198 // are always run (similar to reserved actions). |
| 195 ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[]; | 199 ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[]; |
| 196 ASH_EXPORT extern const size_t kDebugAcceleratorDataLength; | 200 ASH_EXPORT extern const size_t kDebugAcceleratorDataLength; |
| 197 | 201 |
| 198 // Actions that should be handled very early in Ash unless the current target | 202 // Actions that should be handled very early in Ash unless the current target |
| 199 // window is full-screen. | 203 // window is full-screen. |
| (...skipping 29 matching lines...) Expand all Loading... |
| 229 ASH_EXPORT extern const AcceleratorAction kActionsNeedingWindow[]; | 233 ASH_EXPORT extern const AcceleratorAction kActionsNeedingWindow[]; |
| 230 ASH_EXPORT extern const size_t kActionsNeedingWindowLength; | 234 ASH_EXPORT extern const size_t kActionsNeedingWindowLength; |
| 231 | 235 |
| 232 // Actions that can be performed while keeping the menu open. | 236 // Actions that can be performed while keeping the menu open. |
| 233 ASH_EXPORT extern const AcceleratorAction kActionsKeepingMenuOpen[]; | 237 ASH_EXPORT extern const AcceleratorAction kActionsKeepingMenuOpen[]; |
| 234 ASH_EXPORT extern const size_t kActionsKeepingMenuOpenLength; | 238 ASH_EXPORT extern const size_t kActionsKeepingMenuOpenLength; |
| 235 | 239 |
| 236 } // namespace ash | 240 } // namespace ash |
| 237 | 241 |
| 238 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ | 242 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
| OLD | NEW |