mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of the NormalizeShortcutSuggestion function.

Browse source
This commit is contained in:
Cheng Zhao 2013-10-21 14:34:25 +08:00
parent 6e4f74ae35
commit a6eb261af0
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
browser/ui/accelerator_util.cc
View file

@ -15,22 +15,6 @@ namespace accelerator_util {
namespace { namespace {
// Convert "Command" to "Ctrl" on non-Mac.
std::string NormalizeShortcutSuggestion(const std::string& suggestion) {
#if defined(OS_MACOSX)
return suggestion;
#endif
std::string key;
std::vector<std::string> tokens;
base::SplitString(suggestion, '+', &tokens);
for (size_t i = 0; i < tokens.size(); i++) {
if (tokens[i] == "command")
tokens[i] = "ctrl";
}
return JoinString(tokens, '+');
}
// Return key code of the char. // Return key code of the char.
ui::KeyboardCode KeyboardCodeFromCharCode(char c, bool* shifted) { ui::KeyboardCode KeyboardCodeFromCharCode(char c, bool* shifted) {
*shifted = false; *shifted = false;
@ -104,7 +88,6 @@ bool StringToAccelerator(const std::string& description,
return false; return false;
} }
std::string shortcut(StringToLowerASCII(description)); std::string shortcut(StringToLowerASCII(description));
shortcut = NormalizeShortcutSuggestion(shortcut);
std::vector<std::string> tokens; std::vector<std::string> tokens;
base::SplitString(shortcut, '+', &tokens); base::SplitString(shortcut, '+', &tokens);
@ -127,7 +110,13 @@ bool StringToAccelerator(const std::string& description,
} else if (tokens[i] == "ctrl") { } else if (tokens[i] == "ctrl") {
modifiers |= ui::EF_CONTROL_DOWN; modifiers |= ui::EF_CONTROL_DOWN;
} else if (tokens[i] == "command") { } else if (tokens[i] == "command") {
// The "Command" would be translated to "Ctrl" on platforms other than
// OS X.
#if defined(OS_MACOSX)
modifiers |= ui::EF_COMMAND_DOWN; modifiers |= ui::EF_COMMAND_DOWN;
#else
modifiers |= ui::EF_CONTROL_DOWN;
#endif
} else if (tokens[i] == "alt") { } else if (tokens[i] == "alt") {
modifiers |= ui::EF_ALT_DOWN; modifiers |= ui::EF_ALT_DOWN;
} else if (tokens[i] == "shift") { } else if (tokens[i] == "shift") {