chore: bump chromium to 134.0.6998.10 (main) (#45564)
* chore: bump chromium to 134.0.6992.0 * chore: add BrowserProcessImpl::CreateGlobalFeaturesForTesting() stub Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6216193 Remove GlobalFeatures from TestingBrowserProcess::Init * chore: bump chromium to 134.0.6994.0 * 6208630: Mac sandbox: don't use protobuf for policy serialization | https://chromium-review.googlesource.com/c/chromium/src/+/6208630 * [PDF] Remove HasUnsupportedFeature Mojo interface Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6220800 * 6217444: Remove scoped_gdi_object.h type aliases. | https://chromium-review.googlesource.com/c/chromium/src/+/6217444 * chore: bump chromium to 134.0.6998.10 * 6221378: Revert [OBC] Exclude Aliasing Cookies in FilterCookiesWithOptions() | https://chromium-review.googlesource.com/c/chromium/src/+/6221378 * Update ExtensionPrefs::GetDisableReasons to return DisableReasonSet Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6218840 change copied from 6218840 extensions/shell/browser/shell_extension_loader.cc * 6218402: Typemap ui.gfx.DXGIHandle <=> gfx::DXGIHandle | https://chromium-review.googlesource.com/c/chromium/src/+/6218402 * chore: disable flaky contentTracing test not new to this roll; it is happening in main as well * fixup! chore: disable flaky contentTracing test --------- Co-authored-by: alice <alice@makenotion.com>
This commit is contained in:
parent
9f47c9a051
commit
aa06b065c0
17 changed files with 69 additions and 94 deletions
|
@ -102,7 +102,8 @@ bool IsTemplateFilename(const base::FilePath& path) {
|
|||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
|
||||
base::win::ScopedGDIObject<HICON> ReadICOFromPath(int size,
|
||||
const base::FilePath& path) {
|
||||
// If file is in asar archive, we extract it to a temp file so LoadImage can
|
||||
// load it.
|
||||
base::FilePath asar_path, relative_path;
|
||||
|
@ -115,7 +116,7 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
|
|||
}
|
||||
|
||||
// Load the icon from file.
|
||||
return base::win::ScopedHICON(
|
||||
return base::win::ScopedGDIObject<HICON>(
|
||||
static_cast<HICON>(LoadImage(nullptr, image_path.value().c_str(),
|
||||
IMAGE_ICON, size, size, LR_LOADFROMFILE)));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue