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

chore: fix various chromium-style errors in windows (#13394)

Browse source 
These errors weren't previously picked up because the GN build wasn't running on Windows.
This commit is contained in:
Jeremy Apthorp 2018-06-25 22:30:00 +02:00 • committed by GitHub
parent 1c64ac8c41
commit 6f91af9343
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 100 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/common/api/atom_api_native_image.cc
View file

@ -245,15 +245,14 @@ HICON NativeImage::GetHICON(int size) {
// First try loading the icon with specified size.
if (!hicon_path_.empty()) {
hicons_[size] = std::move(ReadICOFromPath(size, hicon_path_));
hicons_[size] = ReadICOFromPath(size, hicon_path_);
return hicons_[size].get();
}
// Then convert the image to ICO.
if (image_.IsEmpty())
return NULL;
hicons_[size] =
std::move(IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap()));
hicons_[size] = IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap());
return hicons_[size].get();
}
#endif