mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 132.0.6807.0 (34-x-y) (#44361)
* chore: bump chromium in DEPS to 132.0.6791.1 * 5804481: [UI] Migrate remaining clients of `MenuSourceType` https://chromium-review.googlesource.com/c/chromium/src/+/5804481 * chore: bump chromium in DEPS to 132.0.6793.1 * chore: bump chromium in DEPS to 132.0.6794.0 * chore: bump chromium in DEPS to 132.0.6797.0 * 5952404: Clean up //ui/base/resource from Lacros code. https://chromium-review.googlesource.com/c/chromium/src/+/5952404 * 5920842: Generate combined grd for PEPC strings and use them in the element https://chromium-review.googlesource.com/c/chromium/src/+/5920842 * 5943708: Enable DynamicSafeAreaInsets for eligible users only https://chromium-review.googlesource.com/c/chromium/src/+/5943708 * 5937004: Remove components/services/language_detection https://chromium-review.googlesource.com/c/chromium/src/+/5937004 * 5920322: [UI] Use mojo enum for `MenuSourceType` in ui/views/controls/ https://chromium-review.googlesource.com/c/chromium/src/+/5920322 * chore: fixup patch indices * chore: bump chromium in DEPS to 132.0.6799.0 * chore: bump chromium in DEPS to 132.0.6801.0 * chore: bump chromium in DEPS to 132.0.6803.0 * chore: bump chromium in DEPS to 132.0.6805.1 * chore: bump chromium in DEPS to 132.0.6807.0 * chore: bump chromium in DEPS to 132.0.6809.1 * chore: bump chromium in DEPS to 132.0.6811.1 * chore: bump chromium in DEPS to 132.0.6813.1 * chore: bump chromium in DEPS to 132.0.6815.1 * chore: bump chromium in DEPS to 132.0.6817.1 * 5947724: [ui] Add missing shortcut text for VKEY_COMMAND on linux https://chromium-review.googlesource.com/c/chromium/src/+/5947724 (cherry picked from commit0fdf6c6e51) * 5948024: [DNT] Fix NavigationController raw_ptr during WebContents destruction https://chromium-review.googlesource.com/c/chromium/src/+/5948024 (cherry picked from commitf6662c3b6d) * 5945209: Roll libc++ from c8eec3629a9e to e2c39ff9388b (1 revision) https://chromium-review.googlesource.com/c/chromium/src/+/5945209 (cherry picked from commit55b75a1456) * 5942398: Remove some chrome:: namespace from chrome/browser/win/* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5942398 (cherry picked from commitd664ce2434) * chore: fixup patch indices (cherry picked from commit657cd6ee34) * 5963016: FSA: Use the profile path for base::DIR_HOME on ChromeOS Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5963016 (cherry picked from commit69505baee6) * chore: fixup patch indices (cherry picked from commitc79c2c8734) * 5924816: [macOS][FSA] Block Access to Application Bundle Path Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5924816 (cherry picked from commitdbcc24fe26) * 5962517: [media] Apply inside blink to renderer/platform/media Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5962517 (cherry picked from commitf396860717) * 5829616: MPArch based GuestViews basic implementation Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5829616 (cherry picked from commitb95772daa3) * 5953710: Expose a rust_static_library instead of raw rs file from rust_bindgen Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5953710 (cherry picked from commit11edc865b5) * chore: fixup patch indices (cherry picked from commit7be81bdd02) * chore: disable ELF CREL on Linux Arm 5938657: Reapply "Enable ELF CREL, which reduces the size of ELF relocatable object files." | https://chromium-review.googlesource.com/c/chromium/src/+/5938657 (cherry picked from commit48c5efd0b0) * chore: bump chromium in DEPS to 132.0.6807.0 (cherry picked from commitf41da7b5a3) * 5868889: Shared Storage: Support saved queries in selectURL Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5868889 (cherry picked from commit4e389ef21a) * Revert "5956408: [fastapi] Promote deprecation of FastApiTypedArray" Refs: https://chromium-review.googlesource.com/c/v8/v8/+/5956408 (cherry picked from commita4b8e46b34) * Revert "5962696: [mojo] Force blink headers to only be included in blink" Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5962696 (cherry picked from commitf0228c286f) * chore: update patches (cherry picked from commit3a3c527a1d) * 5973073: [Extensions] Improve warnings parsing (host) permissions in MV3 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5973073 (cherry picked from commitc571e561e0) * chore: update filenames.libcxx.gni (cherry picked from commit7677e9bfc6) * Apply suggestions from code review Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> (cherry picked from commite8dd8215cf) * chore: update patches after rebase --------- 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: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
committed by
GitHub
parent
7e608f2993
commit
460fc9b452
@@ -13,6 +13,7 @@
|
||||
#include "shell/browser/ui/electron_menu_model.h"
|
||||
#include "shell/common/gin_helper/constructible.h"
|
||||
#include "shell/common/gin_helper/pinnable.h"
|
||||
#include "ui/base/mojom/menu_source_type.mojom-forward.h"
|
||||
|
||||
namespace gin {
|
||||
class Arguments;
|
||||
@@ -83,7 +84,7 @@ class Menu : public gin::Wrappable<Menu>,
|
||||
int x,
|
||||
int y,
|
||||
int positioning_item,
|
||||
ui::MenuSourceType source_type,
|
||||
ui::mojom::MenuSourceType source_type,
|
||||
base::OnceClosure callback) = 0;
|
||||
virtual void ClosePopupAt(int32_t window_id) = 0;
|
||||
virtual std::u16string GetAcceleratorTextAtForTesting(int index) const;
|
||||
|
||||
@@ -26,7 +26,7 @@ class MenuMac : public Menu {
|
||||
int x,
|
||||
int y,
|
||||
int positioning_item,
|
||||
ui::MenuSourceType source_type,
|
||||
ui::mojom::MenuSourceType source_type,
|
||||
base::OnceClosure callback) override;
|
||||
void PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
|
||||
int32_t window_id,
|
||||
|
||||
@@ -51,7 +51,7 @@ void MenuMac::PopupAt(BaseWindow* window,
|
||||
int x,
|
||||
int y,
|
||||
int positioning_item,
|
||||
ui::MenuSourceType source_type,
|
||||
ui::mojom::MenuSourceType source_type,
|
||||
base::OnceClosure callback) {
|
||||
NativeWindow* native_window = window->window();
|
||||
if (!native_window)
|
||||
|
||||
@@ -23,7 +23,7 @@ void MenuViews::PopupAt(BaseWindow* window,
|
||||
int x,
|
||||
int y,
|
||||
int positioning_item,
|
||||
ui::MenuSourceType source_type,
|
||||
ui::mojom::MenuSourceType source_type,
|
||||
base::OnceClosure callback) {
|
||||
auto* native_window = static_cast<NativeWindowViews*>(window->window());
|
||||
if (!native_window)
|
||||
|
||||
@@ -25,7 +25,7 @@ class MenuViews : public Menu {
|
||||
int x,
|
||||
int y,
|
||||
int positioning_item,
|
||||
ui::MenuSourceType source_type,
|
||||
ui::mojom::MenuSourceType source_type,
|
||||
base::OnceClosure callback) override;
|
||||
void ClosePopupAt(int32_t window_id) override;
|
||||
|
||||
|
||||
@@ -75,6 +75,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
|
||||
void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override {}
|
||||
content::BackForwardTransitionAnimationManager*
|
||||
GetBackForwardTransitionAnimationManager() override;
|
||||
void DestroyBackForwardTransitionAnimationManager() override {}
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
bool CloseTabAfterEventTrackingIfNeeded() override;
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#include "shell/browser/native_window.h"
|
||||
#include "shell/browser/ui/views/submenu_button.h"
|
||||
#include "ui/base/mojom/menu_source_type.mojom.h"
|
||||
#include "ui/color/color_provider.h"
|
||||
#include "ui/native_theme/common_theme.h"
|
||||
#include "ui/views/background.h"
|
||||
@@ -196,9 +197,10 @@ void MenuBar::ButtonPressed(size_t id, const ui::Event& event) {
|
||||
|
||||
// Deleted in MenuDelegate::OnMenuClosed
|
||||
auto* menu_delegate = new MenuDelegate(this);
|
||||
menu_delegate->RunMenu(
|
||||
menu_model_->GetSubmenuModelAt(id), source,
|
||||
event.IsKeyEvent() ? ui::MENU_SOURCE_KEYBOARD : ui::MENU_SOURCE_MOUSE);
|
||||
menu_delegate->RunMenu(menu_model_->GetSubmenuModelAt(id), source,
|
||||
event.IsKeyEvent()
|
||||
? ui::mojom::MenuSourceType::kKeyboard
|
||||
: ui::mojom::MenuSourceType::kMouse);
|
||||
menu_delegate->AddObserver(this);
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "shell/browser/ui/views/menu_bar.h"
|
||||
#include "shell/browser/ui/views/menu_model_adapter.h"
|
||||
#include "ui/base/mojom/menu_source_type.mojom.h"
|
||||
#include "ui/views/controls/button/menu_button.h"
|
||||
#include "ui/views/controls/menu/menu_item_view.h"
|
||||
#include "ui/views/controls/menu/menu_runner.h"
|
||||
@@ -23,14 +24,14 @@ MenuDelegate::~MenuDelegate() = default;
|
||||
|
||||
void MenuDelegate::RunMenu(ElectronMenuModel* model,
|
||||
views::Button* button,
|
||||
ui::MenuSourceType source_type) {
|
||||
ui::mojom::MenuSourceType source_type) {
|
||||
gfx::Point screen_loc;
|
||||
views::View::ConvertPointToScreen(button, &screen_loc);
|
||||
// Subtract 1 from the height to make the popup flush with the button border.
|
||||
gfx::Rect bounds(screen_loc.x(), screen_loc.y(), button->width(),
|
||||
button->height() - 1);
|
||||
|
||||
if (source_type == ui::MENU_SOURCE_KEYBOARD) {
|
||||
if (source_type == ui::mojom::MenuSourceType::kKeyboard) {
|
||||
hold_first_switch_ = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ class MenuDelegate : public views::MenuDelegate {
|
||||
|
||||
void RunMenu(ElectronMenuModel* model,
|
||||
views::Button* button,
|
||||
ui::MenuSourceType source_type);
|
||||
ui::mojom::MenuSourceType source_type);
|
||||
|
||||
class Observer {
|
||||
public:
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "base/strings/string_util_win.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "shell/browser/ui/win/notify_icon_host.h"
|
||||
#include "ui/base/mojom/menu_source_type.mojom.h"
|
||||
#include "ui/display/screen.h"
|
||||
#include "ui/display/win/screen_win.h"
|
||||
#include "ui/gfx/geometry/point.h"
|
||||
@@ -227,7 +228,7 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
|
||||
}
|
||||
menu_runner_->RunMenuAt(nullptr, nullptr, rect,
|
||||
views::MenuAnchorPosition::kTopLeft,
|
||||
ui::MENU_SOURCE_MOUSE);
|
||||
ui::mojom::MenuSourceType::kMouse);
|
||||
}
|
||||
|
||||
void NotifyIcon::CloseContextMenu() {
|
||||
|
||||
@@ -48,9 +48,9 @@ static_assert(std::size(MenuSourceTypes) ==
|
||||
static_cast<int32_t>(ui::mojom::MenuSourceType::kMaxValue) + 1);
|
||||
|
||||
// static
|
||||
v8::Local<v8::Value> Converter<ui::MenuSourceType>::ToV8(
|
||||
v8::Local<v8::Value> Converter<ui::mojom::MenuSourceType>::ToV8(
|
||||
v8::Isolate* isolate,
|
||||
const ui::MenuSourceType& in) {
|
||||
const ui::mojom::MenuSourceType& in) {
|
||||
for (auto const& [key, val] : MenuSourceTypes)
|
||||
if (in == val)
|
||||
return StringToV8(isolate, key);
|
||||
@@ -58,9 +58,10 @@ v8::Local<v8::Value> Converter<ui::MenuSourceType>::ToV8(
|
||||
}
|
||||
|
||||
// static
|
||||
bool Converter<ui::MenuSourceType>::FromV8(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> val,
|
||||
ui::MenuSourceType* out) {
|
||||
bool Converter<ui::mojom::MenuSourceType>::FromV8(
|
||||
v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> val,
|
||||
ui::mojom::MenuSourceType* out) {
|
||||
return FromV8WithLookup(isolate, val, MenuSourceTypes, out);
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "third_party/blink/public/common/permissions/permission_utils.h"
|
||||
#include "third_party/blink/public/mojom/choosers/popup_menu.mojom.h"
|
||||
#include "third_party/blink/public/mojom/permissions/permission_status.mojom-forward.h"
|
||||
#include "ui/base/ui_base_types.h"
|
||||
#include "ui/base/mojom/menu_source_type.mojom-forward.h"
|
||||
|
||||
namespace content {
|
||||
struct ContextMenuParams;
|
||||
@@ -44,12 +44,12 @@ struct Converter<ContextMenuParamsWithRenderFrameHost> {
|
||||
};
|
||||
|
||||
template <>
|
||||
struct Converter<ui::MenuSourceType> {
|
||||
struct Converter<ui::mojom::MenuSourceType> {
|
||||
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||
const ui::MenuSourceType& val);
|
||||
const ui::mojom::MenuSourceType& val);
|
||||
static bool FromV8(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> val,
|
||||
ui::MenuSourceType* out);
|
||||
ui::mojom::MenuSourceType* out);
|
||||
};
|
||||
|
||||
template <>
|
||||
|
||||
Reference in New Issue
Block a user