![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 101.0.4911.0 * chore: bump chromium in DEPS to 101.0.4913.0 * chore: bump chromium in DEPS to 101.0.4915.0 * chore: bump chromium in DEPS to 101.0.4917.0 * chore: bump chromium in DEPS to 101.0.4919.0 * chore: bump chromium in DEPS to 101.0.4921.0 * chore: bump chromium in DEPS to 101.0.4923.0 * chore: bump chromium in DEPS to 101.0.4925.0 * chore: bump chromium in DEPS to 101.0.4927.0 * chore: bump chromium in DEPS to 101.0.4929.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4931.0 * chore: update patches * 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref:3475388
Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types |1824792
* 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* chore: reconcile patches with main rebase * chore: bump chromium in DEPS to 101.0.4933.0 * chore: update patches * 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame Ref:3329593
* 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h Ref:3446451
* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags Ref:3499818
* chore: bump chromium in DEPS to 101.0.4935.0 * chore: update patches * 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N) Ref:3463286
* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations" Ref:3506590
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref:3475388
Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types |1880987
The change in the roll started causing the legacy types to fail * chore: missing SkRegion include * 3499600: Introduce blink::WebCssOrigin Ref:3499600
* fixup!: 3503874: Remove base::size(), base::empty(), and base::data(). Ref:3503874
* chore: bump chromium in DEPS to 101.0.4937.0 * chore: update patches * 3500826: [locales] Refactor locales for ios Ref:3500826
* 3509531: Make some public Blink media files private Ref:3509531
* 3497377: bluetooth: Add BluetoothDevice.forget() Ref:3497377
* chore: bump chromium in DEPS to 101.0.4939.0 * chore: bump chromium in DEPS to 101.0.4941.0 * 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value. Ref:3514804
* 3502592: Delete PPAPI init/shutdown code in //pdf. Ref:3502592
* chore: update patches * fixup! 3502592: Delete PPAPI init/shutdown code in //pdf. * chore: bump chromium in DEPS to 101.0.4943.0 * chore: fix lint, remove unneeded headers * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> * update mojo calls in offscreen patch * update hunspell filenames * chore: bump chromium in DEPS to 101.0.4945.0 * chore: update patches * fix offscreen patch again * chore: bump chromium in DEPS to 101.0.4947.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4949.0 * support unseasoned pdf * update patches * chore: update patches * chore: [IWYU] include missing skia headers * chore: bump chromium in DEPS to 101.0.4951.0 * chore: update patches * 3457645: media: Remove IsKeySystemsUpdateNeeded()3457645
* chore: bump chromium in DEPS to 102.0.4952.2 * chore: update patches * 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage(). Ref:3488672
* 3508375: Fix an issue dangerous dialog is not shown for some apk download Ref:3508375
* chore: bump chromium in DEPS to 102.0.4953.0 * chore: update patches * 3510189: Harden up drag and drop support across same-process boundaries. Ref:3510189
* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/. Ref:3526815
* chore: bump chromium in DEPS to 102.0.4955.0 * build: add af and ur locale to manifests 3498914 [locales] Add af and ur to desktop Ref:3498914
* fixup! build: add af and ur locale to manifests * chore: bump chromium in DEPS to 102.0.4957.0 * 3529090: gin: set JS flags before v8 initialization Xref:3529090
chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch * chore: update patches * 3536433: [network] Rename data_path and http_cache_path from _path to _directory. Xref:3536433
* 3111565: Relocated Page.printToPDF implementation to //components Xref:3111565
refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback TODO: currently passes a placeholder for job_settings. We have other code paths that inject settings from electron_api_web_contents.cc. Should those be injected here as well? (CC @codebytere) * fixup! 3111565: Relocated Page.printToPDF implementation to //components * fixup! 3111565: Relocated Page.printToPDF implementation to //components * 3520025: Make "libcxx_abi_unstable" not a gn arg Xref:3520025
build: since it is no longer a gn arg, patch it in * chore: change usages of std::vector with const elements (#33373) * chore: bump chromium in DEPS to 102.0.4959.0 * chore: update patches * build: iwyu base/threading/platform_thread.h * 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. Xref:3525774
refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager * use gclient_gn_args_from instead of hand-copying * checkout mac on mac * chore: update patches * Revert "checkout mac on mac" This reverts commit fe9ccf49ec6139868ccf2272c2016cefa3f32769. * fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. * fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded() add nogncheck * fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc * Xref:6dfdf79b8c
Xref: https://reviews.llvm.org/D101458 Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and so it must be enumerated in filenames.libcxxabi.gni * 3511268: Remove unused headers from cxx17_backports.h3511268
use std::size instead of base::size * iwyu: SkPaint 3488428: [includes] Fix transitive includes of SkImageEncoder * chore: [IWYU] include missing skia headers * fixup! 3511268: Remove unused headers from cxx17_backports.h * chore: bump chromium in DEPS to 102.0.4961.0 * chore: update patches * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> chore: remove unused #include * fixup! 3510189: Harden up drag and drop support across same-process boundaries. |3510189
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
118 lines
3.5 KiB
C++
118 lines
3.5 KiB
C++
// Copyright 2013 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_UI_GTK_APP_INDICATOR_ICON_H_
|
|
#define ELECTRON_SHELL_BROWSER_UI_GTK_APP_INDICATOR_ICON_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "base/nix/xdg_util.h"
|
|
#include "third_party/skia/include/core/SkImage.h"
|
|
#include "ui/base/glib/glib_signal.h"
|
|
#include "ui/views/linux_ui/status_icon_linux.h"
|
|
|
|
typedef struct _AppIndicator AppIndicator;
|
|
typedef struct _GtkWidget GtkWidget;
|
|
|
|
class SkBitmap;
|
|
|
|
namespace gfx {
|
|
class ImageSkia;
|
|
}
|
|
|
|
namespace ui {
|
|
class MenuModel;
|
|
}
|
|
|
|
namespace electron {
|
|
|
|
namespace gtkui {
|
|
|
|
class AppIndicatorIconMenu;
|
|
|
|
// Status icon implementation which uses libappindicator.
|
|
class AppIndicatorIcon : public views::StatusIconLinux {
|
|
public:
|
|
// The id uniquely identifies the new status icon from other chrome status
|
|
// icons.
|
|
AppIndicatorIcon(std::string id,
|
|
const gfx::ImageSkia& image,
|
|
const std::u16string& tool_tip);
|
|
~AppIndicatorIcon() override;
|
|
|
|
// disable copy
|
|
AppIndicatorIcon(const AppIndicatorIcon&) = delete;
|
|
AppIndicatorIcon& operator=(const AppIndicatorIcon&) = delete;
|
|
|
|
// Indicates whether libappindicator so could be opened.
|
|
static bool CouldOpen();
|
|
|
|
// Overridden from views::StatusIconLinux:
|
|
void SetIcon(const gfx::ImageSkia& image) override;
|
|
void SetToolTip(const std::u16string& tool_tip) override;
|
|
void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
|
|
void RefreshPlatformContextMenu() override;
|
|
|
|
private:
|
|
struct SetImageFromFileParams {
|
|
// The temporary directory in which the icon(s) were written.
|
|
base::FilePath parent_temp_dir;
|
|
|
|
// The icon theme path to pass to libappindicator.
|
|
std::string icon_theme_path;
|
|
|
|
// The icon name to pass to libappindicator.
|
|
std::string icon_name;
|
|
};
|
|
|
|
// Writes |bitmap| to a temporary directory on a worker thread. The temporary
|
|
// directory is selected based on KDE's quirks.
|
|
static SetImageFromFileParams WriteKDE4TempImageOnWorkerThread(
|
|
const SkBitmap& bitmap,
|
|
const base::FilePath& existing_temp_dir);
|
|
|
|
// Writes |bitmap| to a temporary directory on a worker thread. The temporary
|
|
// directory is selected based on Unity's quirks.
|
|
static SetImageFromFileParams WriteUnityTempImageOnWorkerThread(
|
|
const SkBitmap& bitmap,
|
|
int icon_change_count,
|
|
const std::string& id);
|
|
|
|
void SetImageFromFile(const SetImageFromFileParams& params);
|
|
void SetMenu();
|
|
|
|
// Sets a menu item at the top of the menu as a replacement for the status
|
|
// icon click action. Clicking on this menu item should simulate a status icon
|
|
// click by despatching a click event.
|
|
void UpdateClickActionReplacementMenuItem();
|
|
|
|
// Callback for when the status icon click replacement menu item is activated.
|
|
void OnClickActionReplacementMenuItemActivated();
|
|
|
|
std::string id_;
|
|
std::string tool_tip_;
|
|
|
|
// Used to select KDE or Unity for image setting.
|
|
base::nix::DesktopEnvironment desktop_env_;
|
|
|
|
// Gtk status icon wrapper
|
|
AppIndicator* icon_ = nullptr;
|
|
|
|
std::unique_ptr<AppIndicatorIconMenu> menu_;
|
|
ui::MenuModel* menu_model_ = nullptr;
|
|
|
|
base::FilePath temp_dir_;
|
|
int icon_change_count_ = 0;
|
|
|
|
base::WeakPtrFactory<AppIndicatorIcon> weak_factory_{this};
|
|
};
|
|
|
|
} // namespace gtkui
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_UI_GTK_APP_INDICATOR_ICON_H_
|