mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 142.0.7401.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* 6911185: Reland "Send touch moves async immediately after scroll starts."
https://chromium-review.googlesource.com/c/chromium/src/+/6911185
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6906887: mac: click through content area in main window
https://chromium-review.googlesource.com/c/chromium/src/+/6906887
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6916667: Expose helper to eliminate duplicate recipes.
https://chromium-review.googlesource.com/c/chromium/src/+/6916667
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6909842: Switch LegacyRenderWidgetHostHWND from atlcrack.h to msg_util.h.
https://chromium-review.googlesource.com/c/chromium/src/+/6909842
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6884056: Remove the SecKeychain implementation for the Keychain interface
https://chromium-review.googlesource.com/c/chromium/src/+/6884056
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6904906: Remove `WTF::` in renderer/core/[p-x].*/
https://chromium-review.googlesource.com/c/chromium/src/+/6904906
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6556585: [persistent_cache]: PersistentCache for CodeCache
https://chromium-review.googlesource.com/c/chromium/src/+/6556585
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6904864: Layout: Support abort on the text placeholder layout
https://chromium-review.googlesource.com/c/chromium/src/+/6904864
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: fixup patch indices
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: bump chromium in DEPS to 142.0.7402.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* fixup! 6556585: [persistent_cache]: PersistentCache for CodeCache
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: fixup patch indices
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6905244: [api] Remove deprecated `GetIsolate`
https://chromium-review.googlesource.com/c/v8/v8/+/6905244
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6897694: Remove NativeTheme::UserHasContrastPreference().
https://chromium-review.googlesource.com/c/chromium/src/+/6897694
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6897477: Remove GetPlatformHighContrastColorScheme() and enum.
https://chromium-review.googlesource.com/c/chromium/src/+/6897477
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6918198: Reland "Rename display::Screen::GetScreen() to display::Screen::Get()"
https://chromium-review.googlesource.com/c/chromium/src/+/6918198
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6907147: [LNA] add use counter for websocket mixed-content issues
https://chromium-review.googlesource.com/c/chromium/src/+/6907147
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6914538: Replace WTF::String with blink::String
https://chromium-review.googlesource.com/c/website/+/6914538
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6892538: [video pip] Allow touchscreen users to toggle live caption
https://chromium-review.googlesource.com/c/chromium/src/+/6892538
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: fix patch
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: bump chromium in DEPS to 142.0.7403.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* build: remove ninja logs
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: fixup patch indices
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6920670: [PDF] Change pdf_extension_util to return dictionaries
https://chromium-review.googlesource.com/c/chromium/src/+/6920670
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6917864: Devirtualize and inline various NativeTheme getters.
https://chromium-review.googlesource.com/c/chromium/src/+/6917864
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6920873: [PDF] Simplify PDFDocumentHelperClient::OnSaveURL()
https://chromium-review.googlesource.com/c/chromium/src/+/6920873
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* build: don't kill blink/web_tests
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6923655: Roll libc++ from 954086abf121 to b87b2bb112f8 (4 revisions)
https://chromium-review.googlesource.com/c/chromium/src/+/6923655
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6905242: Reland "[CSP] Clarify report-only console messages."
https://chromium-review.googlesource.com/c/chromium/src/+/6905242
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* fixup! 6897694: Remove NativeTheme::UserHasContrastPreference().
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: bump chromium in DEPS to 142.0.7405.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* 6910012: [LNA] Enable LNA enforcement by default
https://chromium-review.googlesource.com/c/chromium/src/+/6910012
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6929444: Combine GetInstanceForXXX() implementations.
https://chromium-review.googlesource.com/c/chromium/src/+/6929444
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6927873: Rename native_widget_types.h -> native_ui_types.h
https://chromium-review.googlesource.com/c/chromium/src/+/6927873
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6853978: Init perfetto really early in WebView
https://chromium-review.googlesource.com/c/chromium/src/+/6853978
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6874886: Use only one picker observer to avoid getting duplicate notifications
https://chromium-review.googlesource.com/c/chromium/src/+/6874886
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: fixup patch indices
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* fix: Protocol complex inline dtor
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: bump chromium in DEPS to 142.0.7407.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* chore: bump chromium in DEPS to 142.0.7409.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* chore: bump chromium in DEPS to 142.0.7411.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* chore: bump chromium in DEPS to 142.0.7413.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* fixup! 6905242: Reland "[CSP] Clarify report-only console messages."
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6927233: Remove NativeTheme "use dark colors" bit.
https://chromium-review.googlesource.com/c/chromium/src/+/6927233
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: fixup patch indices
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* 6899206: [PermissionOptions] Multi-state permission subscriptions & setting changes
https://chromium-review.googlesource.com/c/chromium/src/+/6899206
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: bump chromium in DEPS to 142.0.7415.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* 6936895: [headless] Remove headless flag from views::Widget class
https://chromium-review.googlesource.com/c/chromium/src/+/6936895
We should probably followup on this to see if there is a way to do this without reverting this CL.
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
* 6937023: Reland "Use new DBus type system in dbus_xdg::Request"
https://chromium-review.googlesource.com/c/chromium/src/+/6937023
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
* chore: update patches
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
* 6944749: Add GN visibility list to //components/os_crypt/sync
https://chromium-review.googlesource.com/c/chromium/src/+/6944749
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
* Further replace sub_capture_target_version with CaptureVersion
https://chromium-review.googlesource.com/c/chromium/src/+/6935455
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
* fixup for lint
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
* chore: update filenames.libcxx.gni
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
* chore: bump chromium in DEPS to 142.0.7417.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* 6944136: Reorder NativeTheme headers/.cc files.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944136
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* 6939701: [DSSC][4] Make FSVCI objects aware of their capture-version-source
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6939701
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* 6944404: Remove extraneous callback call
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944404
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* 6936124: [FPF-CI]: Introduce blink::NoiseToken for fingerprinting protection
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6936124
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* chore: update patches
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* fixup! 6927233: Remove NativeTheme "use dark colors" bit.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* fixup! 6917864: Devirtualize and inline various NativeTheme getters.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6917864
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* 6937588: Add initial OsSettingsProvider object, supplying caret blink interval.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6937588
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* fixup! 6905242: Reland "[CSP] Clarify report-only console messages."
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6905242
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* 6907515: Replace SingletonHwndObserver with a CallbackList on SingletonHwnd.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6907515
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* 6910482: [Save to Drive] Implement retry functionality
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6910482
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* fixup! 6927233: Remove NativeTheme "use dark colors" bit.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* Revert "build: remove ninja logs"
This reverts commit 72874740fd.
Co-authored-by: Alice Zhao <alicelovescake@anthropic.com>
* test: fix flakey test picked from PR 48205
Co-authored-by: Alice Zhao <alicelovescake@anthropic.com>
* chore: update patches
---------
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
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: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Alice Zhao <alicelovescake@anthropic.com>
95 lines
3.1 KiB
C++
95 lines
3.1 KiB
C++
// Copyright (c) 2014 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_views.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "shell/browser/api/electron_api_base_window.h"
|
|
#include "shell/browser/api/electron_api_web_frame_main.h"
|
|
#include "shell/browser/native_window_views.h"
|
|
#include "ui/display/screen.h"
|
|
|
|
using views::MenuRunner;
|
|
|
|
namespace electron::api {
|
|
|
|
MenuViews::MenuViews(gin::Arguments* args) : Menu(args) {}
|
|
|
|
MenuViews::~MenuViews() = default;
|
|
|
|
void MenuViews::PopupAt(BaseWindow* window,
|
|
std::optional<WebFrameMain*> frame,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
ui::mojom::MenuSourceType source_type,
|
|
base::OnceClosure callback) {
|
|
const NativeWindow* native_window = window->window();
|
|
if (!native_window)
|
|
return;
|
|
|
|
// (-1, -1) means showing on mouse location.
|
|
gfx::Point location;
|
|
if (x == -1 || y == -1) {
|
|
location = display::Screen::Get()->GetCursorScreenPoint();
|
|
} else {
|
|
gfx::Point origin = native_window->GetContentBounds().origin();
|
|
location = gfx::Point(origin.x() + x, origin.y() + y);
|
|
}
|
|
|
|
int flags = MenuRunner::CONTEXT_MENU | MenuRunner::HAS_MNEMONICS;
|
|
|
|
// Make sure the Menu object would not be garbage-collected until the callback
|
|
// has run.
|
|
base::OnceClosure callback_with_ref = BindSelfToClosure(std::move(callback));
|
|
|
|
// Show the menu.
|
|
//
|
|
// Note that while views::MenuRunner accepts RepeatingCallback as close
|
|
// callback, it is fine passing OnceCallback to it because we reset the
|
|
// menu runner immediately when the menu is closed.
|
|
int32_t window_id = window->weak_map_id();
|
|
auto close_callback = base::AdaptCallbackForRepeating(
|
|
base::BindOnce(&MenuViews::OnClosed, weak_factory_.GetWeakPtr(),
|
|
window_id, std::move(callback_with_ref)));
|
|
auto& runner = menu_runners_[window_id] =
|
|
std::make_unique<MenuRunner>(model(), flags, std::move(close_callback));
|
|
runner->RunMenuAt(native_window->widget(), nullptr,
|
|
gfx::Rect{location, gfx::Size{}},
|
|
views::MenuAnchorPosition::kTopLeft, source_type);
|
|
}
|
|
|
|
void MenuViews::ClosePopupAt(int32_t window_id) {
|
|
if (auto iter = menu_runners_.find(window_id); iter != menu_runners_.end()) {
|
|
// Close the runner for the window.
|
|
iter->second->Cancel();
|
|
return;
|
|
}
|
|
|
|
if (window_id == -1) {
|
|
// When -1 is passed in, close all opened runners.
|
|
// Note: `Cancel()` invalidaes iters, so move() to a temp before looping
|
|
auto tmp = std::move(menu_runners_);
|
|
for (auto& [id, runner] : tmp)
|
|
runner->Cancel();
|
|
}
|
|
}
|
|
|
|
void MenuViews::OnClosed(int32_t window_id, base::OnceClosure callback) {
|
|
menu_runners_.erase(window_id);
|
|
std::move(callback).Run();
|
|
}
|
|
|
|
// static
|
|
gin_helper::Handle<Menu> Menu::New(gin::Arguments* args) {
|
|
auto handle = gin_helper::CreateHandle(
|
|
args->isolate(), static_cast<Menu*>(new MenuViews(args)));
|
|
gin_helper::CallMethod(args->isolate(), handle.get(), "_init");
|
|
return handle;
|
|
}
|
|
|
|
} // namespace electron::api
|