
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 * chore: update patches * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 * chore: update patches * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 * chore: remove deleted file from chromium_src list * chore: fix lint * update patches * chore: bump chromium in DEPS to 91.0.4438.0 * chore: bump chromium in DEPS to 91.0.4439.0 * chore: bump chromium in DEPS to 91.0.4440.0 * chore: bump chromium in DEPS to 91.0.4441.0 * chore: bump chromium in DEPS to 91.0.4442.0 * chore: bump chromium in DEPS to 91.0.4443.0 * chore: bump chromium in DEPS to 91.0.4445.0 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: update patches * fixup gn check * Merge branch 'master' into roller/chromium/master * update to xcode 12.4.0 Needed because of8008deb41c
* 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 * chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 * Fixup 2721718: Move HostID to extensions::mojom::HostID * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() * update node headers * chore: bump chromium in DEPS to 91.0.4449.0 * Revert "chore: bump chromium in DEPS to 91.0.4449.0" This reverts commitbccafa0289
. * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build * fix StrCat issue * incantations for WebContentsPreferences::GetPreloadPath wide strings * bump nan * fix GetAsString maybe? * windows build fixes * more windows build fix * SetAppUserModelID -> wstring * upgrade nan dep in tests * lint * wstrings are cross-platform * linter * only bind setAppUserModelId on windows * fix a messed up merge * well that was an odyssey * backport fcdf35e from v8 to fix nan crash * disable typedarrays-test.js * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 * use PartitionAllocator for ArrayBuffers in the main process * fix patches * chore: omit some unnecessary conversions * refactor: make LoginItemSettings::path a wstring * refactor: make ShowTaskDialog take a wstr * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b
. 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: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
86 lines
2.7 KiB
C++
86 lines
2.7 KiB
C++
// Copyright 2014 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.
|
|
|
|
#include "shell/browser/ui/gtk/gtk_status_icon.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "base/debug/leak_annotations.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "shell/browser/ui/gtk/app_indicator_icon_menu.h"
|
|
#include "shell/browser/ui/gtk_util.h"
|
|
#include "ui/base/models/menu_model.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
|
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
|
|
|
namespace electron {
|
|
|
|
namespace gtkui {
|
|
|
|
GtkStatusIcon::GtkStatusIcon(const gfx::ImageSkia& image,
|
|
const std::u16string& tool_tip) {
|
|
GdkPixbuf* pixbuf = gtk_util::GdkPixbufFromSkBitmap(*image.bitmap());
|
|
{
|
|
// GTK has a bug that leaks 384 bytes when creating a GtkStatusIcon. It
|
|
// will not be fixed since the status icon was deprecated in version 3.14.
|
|
// Luckily, Chromium doesn't need to create a status icon very often, if at
|
|
// all.
|
|
ANNOTATE_SCOPED_MEMORY_LEAK;
|
|
gtk_status_icon_ = gtk_status_icon_new_from_pixbuf(pixbuf);
|
|
}
|
|
g_object_unref(pixbuf);
|
|
|
|
g_signal_connect(gtk_status_icon_, "activate", G_CALLBACK(OnClickThunk),
|
|
this);
|
|
g_signal_connect(gtk_status_icon_, "popup_menu",
|
|
G_CALLBACK(OnContextMenuRequestedThunk), this);
|
|
SetToolTip(tool_tip);
|
|
}
|
|
|
|
GtkStatusIcon::~GtkStatusIcon() {
|
|
gtk_status_icon_set_visible(gtk_status_icon_, FALSE);
|
|
g_object_unref(gtk_status_icon_);
|
|
}
|
|
|
|
void GtkStatusIcon::SetIcon(const gfx::ImageSkia& image) {
|
|
GdkPixbuf* pixbuf = gtk_util::GdkPixbufFromSkBitmap(*image.bitmap());
|
|
gtk_status_icon_set_from_pixbuf(gtk_status_icon_, pixbuf);
|
|
g_object_unref(pixbuf);
|
|
}
|
|
|
|
void GtkStatusIcon::SetToolTip(const std::u16string& tool_tip) {
|
|
gtk_status_icon_set_tooltip_text(gtk_status_icon_,
|
|
base::UTF16ToUTF8(tool_tip).c_str());
|
|
}
|
|
|
|
void GtkStatusIcon::UpdatePlatformContextMenu(ui::MenuModel* model) {
|
|
menu_.reset();
|
|
if (model)
|
|
menu_ = std::make_unique<AppIndicatorIconMenu>(model);
|
|
}
|
|
|
|
void GtkStatusIcon::RefreshPlatformContextMenu() {
|
|
if (menu_.get())
|
|
menu_->Refresh();
|
|
}
|
|
|
|
void GtkStatusIcon::OnClick(GtkStatusIcon* status_icon) {
|
|
if (delegate())
|
|
delegate()->OnClick();
|
|
}
|
|
|
|
void GtkStatusIcon::OnContextMenuRequested(GtkStatusIcon* status_icon,
|
|
guint button,
|
|
guint32 activate_time) {
|
|
if (menu_.get()) {
|
|
gtk_menu_popup(menu_->GetGtkMenu(), nullptr, nullptr,
|
|
gtk_status_icon_position_menu, gtk_status_icon_, button,
|
|
activate_time);
|
|
}
|
|
}
|
|
|
|
} // namespace gtkui
|
|
|
|
} // namespace electron
|