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

chore: bump chromium to e049d599a8332b9b2785b0178be74 (master) (#20314)

Browse source
This commit is contained in:
Electron Bot 2019-10-18 15:57:34 -04:00 • committed by Jeremy Apthorp
parent 0090616f7b
commit 3ac3fbdbfb
94 changed files with 670 additions and 1213 deletions
Download patch file Download diff file Expand all files Collapse all files

28
shell/browser/ui/tray_icon_gtk.cc
View file

@ -6,10 +6,10 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h"
#include "shell/browser/browser.h"
#include "shell/common/application_info.h"
#include "ui/gfx/image/image.h"
#include "ui/views/linux_ui/linux_ui.h"
namespace electron {
@ -18,38 +18,40 @@ TrayIconGtk::TrayIconGtk() = default;
TrayIconGtk::~TrayIconGtk() = default;
void TrayIconGtk::SetImage(const gfx::Image& image) {
image_ = image.AsImageSkia();
if (icon_) {
icon_->SetIcon(image.AsImageSkia());
icon_->SetIcon(image_);
return;
}
const auto toolTip = base::UTF8ToUTF16(GetApplicationName());
icon_ = views::LinuxUI::instance()->CreateLinuxStatusIcon(
image.AsImageSkia(), toolTip, Browser::Get()->GetName().c_str());
tool_tip_ = base::UTF8ToUTF16(GetApplicationName());
icon_ = base::MakeRefCounted<StatusIconLinuxDbus>();
icon_->SetIcon(image_);
icon_->SetToolTip(tool_tip_);
icon_->SetDelegate(this);
}
void TrayIconGtk::SetToolTip(const std::string& tool_tip) {
icon_->SetToolTip(base::UTF8ToUTF16(tool_tip));
tool_tip_ = base::UTF8ToUTF16(tool_tip);
icon_->SetToolTip(tool_tip_);
}
void TrayIconGtk::SetContextMenu(AtomMenuModel* menu_model) {
icon_->UpdatePlatformContextMenu(menu_model);
icon_->UpdatePlatformContextMenu(menu_model_);
menu_model_ = menu_model;
}
const gfx::ImageSkia& TrayIconGtk::GetImage() const {
NOTREACHED();
return dummy_image_;
return image_;
}
const base::string16& TrayIconGtk::GetToolTip() const {
NOTREACHED();
return dummy_string_;
return tool_tip_;
}
ui::MenuModel* TrayIconGtk::GetMenuModel() const {
NOTREACHED();
return nullptr;
return menu_model_;
}
void TrayIconGtk::OnImplInitializationFailed() {}