28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
330 lines
10 KiB
C++
330 lines
10 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/api/electron_api_menu.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "shell/browser/api/ui_event.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/common/gin_converters/accelerator_converter.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_converters/file_path_converter.h"
|
|
#include "shell/common/gin_converters/gurl_converter.h"
|
|
#include "shell/common/gin_converters/image_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/object_template_builder.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "ui/base/models/image_model.h"
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
|
|
namespace gin {
|
|
|
|
using SharingItem = electron::ElectronMenuModel::SharingItem;
|
|
|
|
template <>
|
|
struct Converter<SharingItem> {
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
SharingItem* out) {
|
|
gin_helper::Dictionary dict;
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
return false;
|
|
dict.GetOptional("texts", &(out->texts));
|
|
dict.GetOptional("filePaths", &(out->file_paths));
|
|
dict.GetOptional("urls", &(out->urls));
|
|
return true;
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
#endif
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
gin::WrapperInfo Menu::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
Menu::Menu(gin::Arguments* args)
|
|
: model_(std::make_unique<ElectronMenuModel>(this)) {
|
|
model_->AddObserver(this);
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
gin_helper::Dictionary options;
|
|
if (args->GetNext(&options)) {
|
|
ElectronMenuModel::SharingItem item;
|
|
if (options.Get("sharingItem", &item))
|
|
model_->SetSharingItem(std::move(item));
|
|
}
|
|
#endif
|
|
}
|
|
|
|
Menu::~Menu() {
|
|
if (model_) {
|
|
model_->RemoveObserver(this);
|
|
}
|
|
}
|
|
|
|
bool InvokeBoolMethod(const Menu* menu,
|
|
const char* method,
|
|
int command_id,
|
|
bool default_value = false) {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
// We need to cast off const here because GetWrapper() is non-const, but
|
|
// ui::SimpleMenuModel::Delegate's methods are const.
|
|
v8::Local<v8::Value> val = gin_helper::CallMethod(
|
|
isolate, const_cast<Menu*>(menu), method, command_id);
|
|
bool ret = false;
|
|
return gin::ConvertFromV8(isolate, val, &ret) ? ret : default_value;
|
|
}
|
|
|
|
bool Menu::IsCommandIdChecked(int command_id) const {
|
|
return InvokeBoolMethod(this, "_isCommandIdChecked", command_id);
|
|
}
|
|
|
|
bool Menu::IsCommandIdEnabled(int command_id) const {
|
|
return InvokeBoolMethod(this, "_isCommandIdEnabled", command_id);
|
|
}
|
|
|
|
bool Menu::IsCommandIdVisible(int command_id) const {
|
|
return InvokeBoolMethod(this, "_isCommandIdVisible", command_id);
|
|
}
|
|
|
|
bool Menu::ShouldCommandIdWorkWhenHidden(int command_id) const {
|
|
return InvokeBoolMethod(this, "_shouldCommandIdWorkWhenHidden", command_id);
|
|
}
|
|
|
|
bool Menu::GetAcceleratorForCommandIdWithParams(
|
|
int command_id,
|
|
bool use_default_accelerator,
|
|
ui::Accelerator* accelerator) const {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
v8::Local<v8::Value> val = gin_helper::CallMethod(
|
|
isolate, const_cast<Menu*>(this), "_getAcceleratorForCommandId",
|
|
command_id, use_default_accelerator);
|
|
return gin::ConvertFromV8(isolate, val, accelerator);
|
|
}
|
|
|
|
bool Menu::ShouldRegisterAcceleratorForCommandId(int command_id) const {
|
|
return InvokeBoolMethod(this, "_shouldRegisterAcceleratorForCommandId",
|
|
command_id);
|
|
}
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
bool Menu::GetSharingItemForCommandId(
|
|
int command_id,
|
|
ElectronMenuModel::SharingItem* item) const {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope handle_scope(isolate);
|
|
v8::Local<v8::Value> val =
|
|
gin_helper::CallMethod(isolate, const_cast<Menu*>(this),
|
|
"_getSharingItemForCommandId", command_id);
|
|
return gin::ConvertFromV8(isolate, val, item);
|
|
}
|
|
#endif
|
|
|
|
void Menu::ExecuteCommand(int command_id, int flags) {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
gin_helper::CallMethod(isolate, const_cast<Menu*>(this), "_executeCommand",
|
|
CreateEventFromFlags(flags), command_id);
|
|
}
|
|
|
|
void Menu::OnMenuWillShow(ui::SimpleMenuModel* source) {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
gin_helper::CallMethod(isolate, const_cast<Menu*>(this), "_menuWillShow");
|
|
}
|
|
|
|
base::OnceClosure Menu::BindSelfToClosure(base::OnceClosure callback) {
|
|
// return ((callback, ref) => { callback() }).bind(null, callback, this)
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::Locker locker(isolate);
|
|
v8::HandleScope scope(isolate);
|
|
v8::Local<v8::Object> self;
|
|
if (GetWrapper(isolate).ToLocal(&self)) {
|
|
v8::Global<v8::Value> ref(isolate, self);
|
|
return base::BindOnce(
|
|
[](base::OnceClosure callback, v8::Global<v8::Value> ref) {
|
|
std::move(callback).Run();
|
|
},
|
|
std::move(callback), std::move(ref));
|
|
} else {
|
|
return base::DoNothing();
|
|
}
|
|
}
|
|
|
|
void Menu::InsertItemAt(int index,
|
|
int command_id,
|
|
const std::u16string& label) {
|
|
model_->InsertItemAt(index, command_id, label);
|
|
}
|
|
|
|
void Menu::InsertSeparatorAt(int index) {
|
|
model_->InsertSeparatorAt(index, ui::NORMAL_SEPARATOR);
|
|
}
|
|
|
|
void Menu::InsertCheckItemAt(int index,
|
|
int command_id,
|
|
const std::u16string& label) {
|
|
model_->InsertCheckItemAt(index, command_id, label);
|
|
}
|
|
|
|
void Menu::InsertRadioItemAt(int index,
|
|
int command_id,
|
|
const std::u16string& label,
|
|
int group_id) {
|
|
model_->InsertRadioItemAt(index, command_id, label, group_id);
|
|
}
|
|
|
|
void Menu::InsertSubMenuAt(int index,
|
|
int command_id,
|
|
const std::u16string& label,
|
|
Menu* menu) {
|
|
menu->parent_ = this;
|
|
model_->InsertSubMenuAt(index, command_id, label, menu->model_.get());
|
|
}
|
|
|
|
void Menu::SetIcon(int index, const gfx::Image& image) {
|
|
model_->SetIcon(index, ui::ImageModel::FromImage(image));
|
|
}
|
|
|
|
void Menu::SetSublabel(int index, const std::u16string& sublabel) {
|
|
model_->SetSecondaryLabel(index, sublabel);
|
|
}
|
|
|
|
void Menu::SetToolTip(int index, const std::u16string& toolTip) {
|
|
model_->SetToolTip(index, toolTip);
|
|
}
|
|
|
|
void Menu::SetRole(int index, const std::u16string& role) {
|
|
model_->SetRole(index, role);
|
|
}
|
|
|
|
void Menu::Clear() {
|
|
model_->Clear();
|
|
}
|
|
|
|
int Menu::GetIndexOfCommandId(int command_id) const {
|
|
return model_->GetIndexOfCommandId(command_id);
|
|
}
|
|
|
|
int Menu::GetItemCount() const {
|
|
return model_->GetItemCount();
|
|
}
|
|
|
|
int Menu::GetCommandIdAt(int index) const {
|
|
return model_->GetCommandIdAt(index);
|
|
}
|
|
|
|
std::u16string Menu::GetLabelAt(int index) const {
|
|
return model_->GetLabelAt(index);
|
|
}
|
|
|
|
std::u16string Menu::GetSublabelAt(int index) const {
|
|
return model_->GetSecondaryLabelAt(index);
|
|
}
|
|
|
|
std::u16string Menu::GetToolTipAt(int index) const {
|
|
return model_->GetToolTipAt(index);
|
|
}
|
|
|
|
std::u16string Menu::GetAcceleratorTextAtForTesting(int index) const {
|
|
ui::Accelerator accelerator;
|
|
model_->GetAcceleratorAtWithParams(index, true, &accelerator);
|
|
return accelerator.GetShortcutText();
|
|
}
|
|
|
|
bool Menu::IsItemCheckedAt(int index) const {
|
|
return model_->IsItemCheckedAt(index);
|
|
}
|
|
|
|
bool Menu::IsEnabledAt(int index) const {
|
|
return model_->IsEnabledAt(index);
|
|
}
|
|
|
|
bool Menu::IsVisibleAt(int index) const {
|
|
return model_->IsVisibleAt(index);
|
|
}
|
|
|
|
bool Menu::WorksWhenHiddenAt(int index) const {
|
|
return model_->WorksWhenHiddenAt(index);
|
|
}
|
|
|
|
void Menu::OnMenuWillClose() {
|
|
Unpin();
|
|
Emit("menu-will-close");
|
|
}
|
|
|
|
void Menu::OnMenuWillShow() {
|
|
Pin(JavascriptEnvironment::GetIsolate());
|
|
Emit("menu-will-show");
|
|
}
|
|
|
|
// static
|
|
v8::Local<v8::ObjectTemplate> Menu::FillObjectTemplate(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::ObjectTemplate> templ) {
|
|
return gin::ObjectTemplateBuilder(isolate, "Menu", templ)
|
|
.SetMethod("insertItem", &Menu::InsertItemAt)
|
|
.SetMethod("insertCheckItem", &Menu::InsertCheckItemAt)
|
|
.SetMethod("insertRadioItem", &Menu::InsertRadioItemAt)
|
|
.SetMethod("insertSeparator", &Menu::InsertSeparatorAt)
|
|
.SetMethod("insertSubMenu", &Menu::InsertSubMenuAt)
|
|
.SetMethod("setIcon", &Menu::SetIcon)
|
|
.SetMethod("setSublabel", &Menu::SetSublabel)
|
|
.SetMethod("setToolTip", &Menu::SetToolTip)
|
|
.SetMethod("setRole", &Menu::SetRole)
|
|
.SetMethod("clear", &Menu::Clear)
|
|
.SetMethod("getIndexOfCommandId", &Menu::GetIndexOfCommandId)
|
|
.SetMethod("getItemCount", &Menu::GetItemCount)
|
|
.SetMethod("getCommandIdAt", &Menu::GetCommandIdAt)
|
|
.SetMethod("getLabelAt", &Menu::GetLabelAt)
|
|
.SetMethod("getSublabelAt", &Menu::GetSublabelAt)
|
|
.SetMethod("getToolTipAt", &Menu::GetToolTipAt)
|
|
.SetMethod("isItemCheckedAt", &Menu::IsItemCheckedAt)
|
|
.SetMethod("isEnabledAt", &Menu::IsEnabledAt)
|
|
.SetMethod("worksWhenHiddenAt", &Menu::WorksWhenHiddenAt)
|
|
.SetMethod("isVisibleAt", &Menu::IsVisibleAt)
|
|
.SetMethod("popupAt", &Menu::PopupAt)
|
|
.SetMethod("closePopupAt", &Menu::ClosePopupAt)
|
|
.SetMethod("_getAcceleratorTextAt", &Menu::GetAcceleratorTextAtForTesting)
|
|
#if BUILDFLAG(IS_MAC)
|
|
.SetMethod("_getUserAcceleratorAt", &Menu::GetUserAcceleratorAt)
|
|
#endif
|
|
.Build();
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|
|
|
|
namespace {
|
|
|
|
using electron::api::Menu;
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
v8::Isolate* isolate = context->GetIsolate();
|
|
|
|
gin_helper::Dictionary dict(isolate, exports);
|
|
dict.Set("Menu", Menu::GetConstructor(context));
|
|
#if BUILDFLAG(IS_MAC)
|
|
dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
|
|
dict.SetMethod("sendActionToFirstResponder",
|
|
&Menu::SendActionToFirstResponder);
|
|
#endif
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_menu, Initialize)
|