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

chore: bump chromium to 132.0.6807.0 (main) (#44360)

Browse source 
* chore: bump chromium in DEPS to 132.0.6791.0

* 5804481: [UI] Migrate remaining clients of `MenuSourceType`

5804481

* chore: try revert PA CL

* chore: bump chromium in DEPS to 132.0.6793.0

* chore: bump chromium in DEPS to 132.0.6794.0

* 5952404: Clean up //ui/base/resource from Lacros code.

5952404

* 5920842: Generate combined grd for PEPC strings and use them in the element

5920842

* 5943708: Enable DynamicSafeAreaInsets for eligible users only

5943708

* chore: fixup patch indices

* 5937004: Remove components/services/language_detection

5937004

* 5920322: [UI] Use mojo enum for `MenuSourceType` in ui/views/controls/

5920322

* chore: bump chromium in DEPS to 132.0.6797.0

* 5947724: [ui] Add missing shortcut text for VKEY_COMMAND on linux

5947724

* chore: fixup patch indices

* 5948024: [DNT] Fix NavigationController raw_ptr during WebContents destruction

5948024

* 5945209: Roll libc++ from c8eec3629a9e to e2c39ff9388b (1 revision)

5945209

* 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

* 5942398: Remove some chrome:: namespace from chrome/browser/win/*

Refs: 5942398

* 5963016: FSA: Use the profile path for base::DIR_HOME on ChromeOS

Refs: 5963016

* chore: fixup patch indices

* chore: bump chromium in DEPS to 132.0.6805.0

* 5924816: [macOS][FSA] Block Access to Application Bundle Path

Refs: 5924816

* 5962517: [media] Apply inside blink to renderer/platform/media

Refs: 5962517

* 5829616: MPArch based GuestViews basic implementation

Refs: 5829616

* 5953710: Expose a rust_static_library instead of raw rs file from rust_bindgen

Refs: 5953710

* chore: fixup patch indices

* chore:  disable ELF CREL on Linux Arm

5938657: Reapply "Enable ELF CREL, which reduces the size of ELF relocatable object files." | 5938657

* chore: bump chromium in DEPS to 132.0.6807.0

* 5868889: Shared Storage: Support saved queries in selectURL

Refs: 5868889

* Revert "5956408: [fastapi] Promote deprecation of FastApiTypedArray"

Refs: 5956408

* Revert "5962696: [mojo] Force blink headers to only be included in blink"

Refs: 5962696

* chore: update patches

* 5973073: [Extensions] Improve warnings parsing (host) permissions in MV3

Refs: 5973073

* chore: update filenames.libcxx.gni

* Apply suggestions from code review

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

---------

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:
electron-roller[bot] 2024-11-04 09:10:00 -05:00 • committed by GitHub
parent d9a9d5b8fe
commit 48801be8e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
95 changed files with 498 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shell/browser/api/electron_api_menu.h
View file

@ -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;

2
shell/browser/api/electron_api_menu_mac.h
View file

@ -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,

2
shell/browser/api/electron_api_menu_mac.mm
View file

@ -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)

2
shell/browser/api/electron_api_menu_views.cc
View file

@ -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)

2
shell/browser/api/electron_api_menu_views.h
View file

@ -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;

1
shell/browser/osr/osr_web_contents_view.h
View file

@ -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
shell/browser/ui/views/menu_bar.cc
View file

@ -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);
}

5
shell/browser/ui/views/menu_delegate.cc
View file

@ -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;
}

2
shell/browser/ui/views/menu_delegate.h
View file

@ -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:

3
shell/browser/ui/win/notify_icon.cc
View file

@ -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() {

11
shell/common/gin_converters/content_converter.cc
View file

@ -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);
}

8
shell/common/gin_converters/content_converter.h
View file

@ -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 <>