refactor: replace remaining NULL
with nullptr
(#40053)
refactor: use nullptr everywhere
This commit is contained in:
parent
9d0e6d09f0
commit
04b2ba84cd
34 changed files with 98 additions and 93 deletions
|
@ -114,8 +114,8 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
|
|||
|
||||
// Load the icon from file.
|
||||
return base::win::ScopedHICON(
|
||||
static_cast<HICON>(LoadImage(NULL, image_path.value().c_str(), IMAGE_ICON,
|
||||
size, size, LR_LOADFROMFILE)));
|
||||
static_cast<HICON>(LoadImage(nullptr, image_path.value().c_str(),
|
||||
IMAGE_ICON, size, size, LR_LOADFROMFILE)));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -214,7 +214,7 @@ HICON NativeImage::GetHICON(int size) {
|
|||
|
||||
// Then convert the image to ICO.
|
||||
if (image_.IsEmpty())
|
||||
return NULL;
|
||||
return nullptr;
|
||||
|
||||
auto& hicon = hicons_[size];
|
||||
hicon = IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap());
|
||||
|
|
|
@ -62,7 +62,7 @@ v8::Local<v8::Promise> NativeImage::CreateThumbnailFromPath(
|
|||
hr = pThumbnailCache->GetThumbnail(
|
||||
pItem.Get(), size.width(),
|
||||
WTS_FLAGS::WTS_SCALETOREQUESTEDSIZE | WTS_FLAGS::WTS_SCALEUP, &pThumbnail,
|
||||
NULL, NULL);
|
||||
nullptr, nullptr);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
promise.RejectWithErrorMessage(
|
||||
|
@ -71,7 +71,7 @@ v8::Local<v8::Promise> NativeImage::CreateThumbnailFromPath(
|
|||
}
|
||||
|
||||
// Init HBITMAP
|
||||
HBITMAP hBitmap = NULL;
|
||||
HBITMAP hBitmap = nullptr;
|
||||
hr = pThumbnail->GetSharedBitmap(&hBitmap);
|
||||
if (FAILED(hr)) {
|
||||
promise.RejectWithErrorMessage("Failed to extract bitmap from thumbnail");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue