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

chore: bump chromium to 105.0.5187.0 (main) (#34921)

Browse source 
* chore: bump chromium in DEPS to 105.0.5179.0

* chore: update patches

* 3758224: Reland^2 "[flags] Enable freezing of flags"

3758224

* chore: bump chromium in DEPS to 105.0.5181.0

* chore: update patches

* chore: bump chromium in DEPS to 105.0.5183.0

* chore: bump chromium in DEPS to 105.0.5185.0

* chore: bump chromium in DEPS to 105.0.5187.0

* chore: update patches

* 3723298: Pass RemoteFrame mojo channels through its creation messages.

3723298

* 3737382: [Code Heath] Replace base::{ListValue,DictionaryValue} in skia et al

3737382

* Pass RemoteFrame mojo channels through its creation messages.

 3723298

* Changed PrintRenderFrame.PrintWithParams mojo interface to use callback.

3761203

* 3738183: [CSP] Add support for `DisableWasmEval`

3738183

* 3740498: Move LinuxUI from //ui/views/linux_ui to //ui/linux

3740498

* 3558277: Moves subsystem and semantics to enum class

3558277

* chore: fix broken steps-electron-gn-check

* 3749583: [arm64] Fix undefined symbol linker error

3749583

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: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2022-07-20 13:03:34 +02:00 • committed by GitHub
parent 1b96a3aa1d
commit 9e0a3c44dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 366 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/browser/ui/tray_icon_gtk.h
View file

@ -9,11 +9,11 @@
#include <string>
#include "shell/browser/ui/tray_icon.h"
#include "ui/views/linux_ui/status_icon_linux.h"
#include "ui/linux/status_icon_linux.h"
namespace electron {
class TrayIconGtk : public TrayIcon, public views::StatusIconLinux::Delegate {
class TrayIconGtk : public TrayIcon, public ui::StatusIconLinux::Delegate {
public:
TrayIconGtk();
~TrayIconGtk() override;
@ -23,7 +23,7 @@ class TrayIconGtk : public TrayIcon, public views::StatusIconLinux::Delegate {
void SetToolTip(const std::string& tool_tip) override;
void SetContextMenu(ElectronMenuModel* menu_model) override;
// views::StatusIconLinux::Delegate
// ui::StatusIconLinux::Delegate
void OnClick() override;
bool HasClickAction() override;
// The following four methods are only used by StatusIconLinuxDbus, which we
@ -34,7 +34,7 @@ class TrayIconGtk : public TrayIcon, public views::StatusIconLinux::Delegate {
void OnImplInitializationFailed() override;
private:
std::unique_ptr<views::StatusIconLinux> icon_;
std::unique_ptr<ui::StatusIconLinux> icon_;
gfx::ImageSkia image_;
std::u16string tool_tip_;
ui::MenuModel* menu_model_;