8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible). So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
107 lines
3.2 KiB
C++
107 lines
3.2 KiB
C++
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/accelerator_util.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/logging.h"
|
|
#include "base/stl_util.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/strings/string_split.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "shell/common/keyboard_util.h"
|
|
|
|
namespace accelerator_util {
|
|
|
|
bool StringToAccelerator(const std::string& shortcut,
|
|
ui::Accelerator* accelerator) {
|
|
if (!base::IsStringASCII(shortcut)) {
|
|
LOG(ERROR) << "The accelerator string can only contain ASCII characters";
|
|
return false;
|
|
}
|
|
|
|
std::vector<std::string> tokens = base::SplitString(
|
|
shortcut, "+", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
|
|
|
|
// Now, parse it into an accelerator.
|
|
int modifiers = ui::EF_NONE;
|
|
ui::KeyboardCode key = ui::VKEY_UNKNOWN;
|
|
absl::optional<char16_t> shifted_char;
|
|
for (const auto& token : tokens) {
|
|
ui::KeyboardCode code = electron::KeyboardCodeFromStr(token, &shifted_char);
|
|
if (shifted_char)
|
|
modifiers |= ui::EF_SHIFT_DOWN;
|
|
switch (code) {
|
|
// The token can be a modifier.
|
|
case ui::VKEY_SHIFT:
|
|
modifiers |= ui::EF_SHIFT_DOWN;
|
|
break;
|
|
case ui::VKEY_CONTROL:
|
|
modifiers |= ui::EF_CONTROL_DOWN;
|
|
break;
|
|
case ui::VKEY_MENU:
|
|
modifiers |= ui::EF_ALT_DOWN;
|
|
break;
|
|
case ui::VKEY_COMMAND:
|
|
modifiers |= ui::EF_COMMAND_DOWN;
|
|
break;
|
|
case ui::VKEY_ALTGR:
|
|
modifiers |= ui::EF_ALTGR_DOWN;
|
|
break;
|
|
// Or it is a normal key.
|
|
default:
|
|
key = code;
|
|
}
|
|
}
|
|
|
|
if (key == ui::VKEY_UNKNOWN) {
|
|
LOG(WARNING) << shortcut << " doesn't contain a valid key";
|
|
return false;
|
|
}
|
|
|
|
*accelerator = ui::Accelerator(key, modifiers);
|
|
accelerator->shifted_char = shifted_char;
|
|
return true;
|
|
}
|
|
|
|
void GenerateAcceleratorTable(AcceleratorTable* table,
|
|
electron::ElectronMenuModel* model) {
|
|
int count = model->GetItemCount();
|
|
for (int i = 0; i < count; ++i) {
|
|
electron::ElectronMenuModel::ItemType type = model->GetTypeAt(i);
|
|
if (type == electron::ElectronMenuModel::TYPE_SUBMENU) {
|
|
auto* submodel = model->GetSubmenuModelAt(i);
|
|
GenerateAcceleratorTable(table, submodel);
|
|
} else {
|
|
ui::Accelerator accelerator;
|
|
if (model->ShouldRegisterAcceleratorAt(i)) {
|
|
if (model->GetAcceleratorAtWithParams(i, true, &accelerator)) {
|
|
MenuItem item = {i, model};
|
|
(*table)[accelerator] = item;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
|
|
const ui::Accelerator& accelerator) {
|
|
const auto iter = table->find(accelerator);
|
|
if (iter != std::end(*table)) {
|
|
const accelerator_util::MenuItem& item = iter->second;
|
|
if (item.model->IsEnabledAt(item.position)) {
|
|
const auto event_flags =
|
|
accelerator.MaskOutKeyEventFlags(accelerator.modifiers());
|
|
item.model->ActivatedAt(item.position, event_flags);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
} // namespace accelerator_util
|