Convert "Command" to "Ctrl" in accelerators on non-Mac.
This commit is contained in:
parent
ae98d9c8b6
commit
32432cc770
2 changed files with 5 additions and 8 deletions
|
@ -15,10 +15,9 @@ namespace accelerator_util {
|
|||
|
||||
namespace {
|
||||
|
||||
// For Mac, we convert "Ctrl" to "Command" and "MacCtrl" to "Ctrl". Other
|
||||
// platforms leave the shortcut untouched.
|
||||
// Convert "Command" to "Ctrl" on non-Mac
|
||||
std::string NormalizeShortcutSuggestion(const std::string& suggestion) {
|
||||
#if !defined(OS_MACOSX)
|
||||
#if defined(OS_MACOSX)
|
||||
return suggestion;
|
||||
#endif
|
||||
|
||||
|
@ -26,9 +25,7 @@ std::string NormalizeShortcutSuggestion(const std::string& suggestion) {
|
|||
std::vector<std::string> tokens;
|
||||
base::SplitString(suggestion, '+', &tokens);
|
||||
for (size_t i = 0; i < tokens.size(); i++) {
|
||||
if (tokens[i] == "Ctrl")
|
||||
tokens[i] = "Command";
|
||||
else if (tokens[i] == "MacCtrl")
|
||||
if (tokens[i] == "Command")
|
||||
tokens[i] = "Ctrl";
|
||||
}
|
||||
return JoinString(tokens, '+');
|
||||
|
|
|
@ -23,5 +23,5 @@
|
|||
|
||||
## Notes on accelerator
|
||||
|
||||
On OS X, the `Ctrl` would automatically translated to `Command`, if you really
|
||||
want `Ctrl` on OS X, you should use `MacCtrl`.
|
||||
On Linux and Windows, the `Command` would be translated to `Ctrl`, so usually
|
||||
you can use `Command` for most of the commands.
|
||||
|
|
Loading…
Reference in a new issue