mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 90.0.4430.19 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 (cherry picked from commitb820b4078d) * chore: bump chromium in DEPS to 91.0.4441.0 * chore: update patches (cherry picked from commit55e50a0879) * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 (cherry picked from commite715b9c921) * chore: update patches (cherry picked from commitc8148febfa) * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit87df2766ba) * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 (cherry picked from commite900271bea) * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 (cherry picked from commiteccfa516c5) * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 (cherry picked from commit2fed02556d) * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 (cherry picked from commit0d94e0d1d9) * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit1a296e59c2) * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commitdc36e8e6fc) * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 (cherry picked from commit59669e99cb) * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commitbe627568b2) * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 (cherry picked from commit77ad17b383) * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 (cherry picked from commit4e02d9407a) * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 (cherry picked from commitf51f427646) * chore: remove deleted file from chromium_src list (cherry picked from commit59432fe30a) * chore: fix lint (cherry picked from commit54cc68dd7a) * update patches (cherry picked from commite99e6a5a8a) * chore: update patches (cherry picked from commit1e16606524) * fixup gn check (cherry picked from commit8f4e362d8f) * update to xcode 12.4.0 Needed because of8008deb41c(cherry picked from commitfae4d87a5a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitd4bec23bde) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit9e336f5d0c) * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 (cherry picked from commit08036802cb) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit676f74f3dc) * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 (cherry picked from commit76538d2d38) * chore: bump chromium in DEPS to 90.0.4430.19 * chore: bump chromium in DEPS to 90.0.4430.30 * chore: bump chromium in DEPS to 90.0.4430.40 * chore: bump chromium in DEPS to 90.0.4430.51 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: bump chromium in DEPS to 91.0.4448.0 (cherry picked from commit003dd6c16c) * Update patches (cherry picked from commit9f5e3f6685) * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 (cherry picked from commitb15b820bca) * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 (cherry picked from commit185c343b22) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit88bbe2a352) * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 (cherry picked from commit3010dd93e3) * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 (cherry picked from commitd54bee03d0) * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target (cherry picked from commit5fc298ee5f) * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 (cherry picked from commit2cd53eb46a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitf1bb6be4b9) * only include mac notifications on mac (cherry picked from commit3160e608e2) * add additional skipping of atk toolchain check (cherry picked from commit86d23cee40) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit22d8f22cfb) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commitec893f8322) * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 (cherry picked from commitd0989802bd) * Fixup 2721718: Move HostID to extensions::mojom::HostID (cherry picked from commit29dfabadfd) * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer (cherry picked from commit97b6868e9c) * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui (cherry picked from commitb6d2ae0455) * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() (cherry picked from commit7e961d8a37) * update node headers (cherry picked from commitc49bc282d5) * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 (cherry picked from commit3b183854ff) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit2d3c65beca) * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build (cherry picked from commitdeeb2de14b) * fix StrCat issue (cherry picked from commit451e0931bf) * incantations for WebContentsPreferences::GetPreloadPath wide strings (cherry picked from commit205f572181) * bump nan (cherry picked from commit74318705c2) * fix GetAsString maybe? (cherry picked from commitea62ecd188) * windows build fixes (cherry picked from commit5b598037bb) * more windows build fix (cherry picked from commit61cf1abd4d) * SetAppUserModelID -> wstring (cherry picked from commit83d93bcbdc) * upgrade nan dep in tests (cherry picked from commit4f97b9303c) * update patch * wstrings are cross-platform (cherry picked from commit7f7b1f6c8a) * linter (cherry picked from commitaaf03765ed) * only bind setAppUserModelId on windows (cherry picked from commit640a145112) * well that was an odyssey (cherry picked from commitdd975328a0) * backport fcdf35e from v8 to fix nan crash (cherry picked from commit606fd87d1e) * disable typedarrays-test.js (cherry picked from commit01ca00ec82) * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 (cherry picked from commit3122820e58) * use PartitionAllocator for ArrayBuffers in the main process (cherry picked from commit1f575ca3af) * fix patches (cherry picked from commit54e72fa8e3) * chore: omit some unnecessary conversions (cherry picked from commit0f3620099a) * refactor: make LoginItemSettings::path a wstring (cherry picked from commit9127cff58b) * refactor: make ShowTaskDialog take a wstr (cherry picked from commit1594c54933) * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b. (cherry picked from commit9684d85101) * fixup patches This reverts commit0cc08813a6. * update patches after merge Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Charles Kerr <charles@charleskerr.com>
139 lines
4.3 KiB
C++
139 lines
4.3 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef SHELL_BROWSER_UI_TRAY_ICON_H_
|
|
#define SHELL_BROWSER_UI_TRAY_ICON_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/observer_list.h"
|
|
#include "shell/browser/ui/electron_menu_model.h"
|
|
#include "shell/browser/ui/tray_icon_observer.h"
|
|
#include "shell/common/gin_converters/guid_converter.h"
|
|
#include "ui/gfx/geometry/rect.h"
|
|
|
|
namespace electron {
|
|
|
|
class TrayIcon {
|
|
public:
|
|
static TrayIcon* Create(base::Optional<UUID> guid);
|
|
|
|
#if defined(OS_WIN)
|
|
using ImageType = HICON;
|
|
#else
|
|
using ImageType = const gfx::Image&;
|
|
#endif
|
|
|
|
virtual ~TrayIcon();
|
|
|
|
// Sets the image associated with this status icon.
|
|
virtual void SetImage(ImageType image) = 0;
|
|
|
|
// Sets the image associated with this status icon when pressed.
|
|
virtual void SetPressedImage(ImageType image);
|
|
|
|
// Sets the hover text for this status icon. This is also used as the label
|
|
// for the menu item which is created as a replacement for the status icon
|
|
// click action on platforms that do not support custom click actions for the
|
|
// status icon (e.g. Ubuntu Unity).
|
|
virtual void SetToolTip(const std::string& tool_tip) = 0;
|
|
|
|
#if defined(OS_MAC)
|
|
// Set/Get flag determining whether to ignore double click events.
|
|
virtual void SetIgnoreDoubleClickEvents(bool ignore) = 0;
|
|
virtual bool GetIgnoreDoubleClickEvents() = 0;
|
|
|
|
struct TitleOptions {
|
|
std::string font_type;
|
|
};
|
|
|
|
// Set/Get title displayed next to status icon in the status bar.
|
|
virtual void SetTitle(const std::string& title,
|
|
const TitleOptions& options) = 0;
|
|
virtual std::string GetTitle() = 0;
|
|
#endif
|
|
|
|
enum class IconType { kNone, kInfo, kWarning, kError, kCustom };
|
|
|
|
struct BalloonOptions {
|
|
IconType icon_type = IconType::kCustom;
|
|
#if defined(OS_WIN)
|
|
HICON icon = nullptr;
|
|
#else
|
|
gfx::Image icon;
|
|
#endif
|
|
std::u16string title;
|
|
std::u16string content;
|
|
bool large_icon = true;
|
|
bool no_sound = false;
|
|
bool respect_quiet_time = false;
|
|
|
|
BalloonOptions();
|
|
};
|
|
|
|
// Displays a notification balloon with the specified contents.
|
|
// Depending on the platform it might not appear by the icon tray.
|
|
virtual void DisplayBalloon(const BalloonOptions& options);
|
|
|
|
// Removes the notification balloon.
|
|
virtual void RemoveBalloon();
|
|
|
|
// Returns focus to the taskbar notification area.
|
|
virtual void Focus();
|
|
|
|
// Popups the menu.
|
|
virtual void PopUpContextMenu(const gfx::Point& pos,
|
|
ElectronMenuModel* menu_model);
|
|
|
|
virtual void CloseContextMenu();
|
|
|
|
// Set the context menu for this icon.
|
|
virtual void SetContextMenu(ElectronMenuModel* menu_model) = 0;
|
|
|
|
// Returns the bounds of tray icon.
|
|
virtual gfx::Rect GetBounds();
|
|
|
|
void AddObserver(TrayIconObserver* obs) { observers_.AddObserver(obs); }
|
|
void RemoveObserver(TrayIconObserver* obs) { observers_.RemoveObserver(obs); }
|
|
|
|
void NotifyClicked(const gfx::Rect& = gfx::Rect(),
|
|
const gfx::Point& location = gfx::Point(),
|
|
int modifiers = 0);
|
|
void NotifyDoubleClicked(const gfx::Rect& = gfx::Rect(), int modifiers = 0);
|
|
void NotifyBalloonShow();
|
|
void NotifyBalloonClicked();
|
|
void NotifyBalloonClosed();
|
|
void NotifyRightClicked(const gfx::Rect& bounds = gfx::Rect(),
|
|
int modifiers = 0);
|
|
void NotifyDrop();
|
|
void NotifyDropFiles(const std::vector<std::string>& files);
|
|
void NotifyDropText(const std::string& text);
|
|
void NotifyDragEntered();
|
|
void NotifyDragExited();
|
|
void NotifyDragEnded();
|
|
void NotifyMouseUp(const gfx::Point& location = gfx::Point(),
|
|
int modifiers = 0);
|
|
void NotifyMouseDown(const gfx::Point& location = gfx::Point(),
|
|
int modifiers = 0);
|
|
void NotifyMouseEntered(const gfx::Point& location = gfx::Point(),
|
|
int modifiers = 0);
|
|
void NotifyMouseExited(const gfx::Point& location = gfx::Point(),
|
|
int modifiers = 0);
|
|
void NotifyMouseMoved(const gfx::Point& location = gfx::Point(),
|
|
int modifiers = 0);
|
|
|
|
protected:
|
|
TrayIcon();
|
|
|
|
private:
|
|
base::ObserverList<TrayIconObserver> observers_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(TrayIcon);
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // SHELL_BROWSER_UI_TRAY_ICON_H_
|