github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 93.0.4536.0 (14-x-y) (#29617)

Browse Source 
* chore: bump chromium in DEPS to 93.0.4536.0

* chore: update patches

* Make InkDrop a View class property

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918475

Replace old views::Button::ink_drop() calls with views::InkDrop::Get()

* Convert use of gfx::ImageSkia to ui::ImageModel for WidgetDelegates

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2935942

Update GetWindowIcon(), GetWindowAppIcon(), and GetDevToolsWindowIcon()
to return ui::ImageModel instead of gfx::ImageSkia.

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot]
2021-06-09 11:34:08 -07:00
committed by GitHub
parent 0e673d069d
commit dd5dd2a426
27 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/browser/api/electron_api_web_contents.cc
View File

@@ -3464,10 +3464,8 @@ void WebContents::DevToolsSearchInPath(int request_id,
}
#if defined(TOOLKIT_VIEWS) && !defined(OS_MAC)
gfx::ImageSkia WebContents::GetDevToolsWindowIcon() {
if (!owner_window())
return gfx::ImageSkia();
return owner_window()->GetWindowAppIcon();
ui::ImageModel WebContents::GetDevToolsWindowIcon() {
return owner_window() ? owner_window()->GetWindowAppIcon() : ui::ImageModel{};
}
#endif

3
shell/browser/api/electron_api_web_contents.h
View File

@@ -40,6 +40,7 @@
#include "shell/common/gin_helper/cleaned_up_at_exit.h"
#include "shell/common/gin_helper/constructible.h"
#include "shell/common/gin_helper/error_thrower.h"
#include "ui/base/models/image_model.h"
#include "ui/gfx/image/image.h"
#if BUILDFLAG(ENABLE_PRINTING)
@@ -659,7 +660,7 @@ class WebContents : public gin::Wrappable<WebContents>,
// InspectableWebContentsViewDelegate:
#if defined(TOOLKIT_VIEWS) && !defined(OS_MAC)
gfx::ImageSkia GetDevToolsWindowIcon() override;
ui::ImageModel GetDevToolsWindowIcon() override;
#endif
#if defined(OS_LINUX)
void GetDevToolsWindowWMClass(std::string* name,