chore: bump chromium to 132.0.6807.0 (main) (#44360)
* 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 element5920842
* 5943708: Enable DynamicSafeAreaInsets for eligible users only5943708
* chore: fixup patch indices * 5937004: Remove components/services/language_detection5937004
* 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 linux5947724
* chore: fixup patch indices * 5948024: [DNT] Fix NavigationController raw_ptr during WebContents destruction5948024
* 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:
parent
d9a9d5b8fe
commit
48801be8e9
95 changed files with 498 additions and 403 deletions
|
@ -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() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue