Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: extensions/browser/extension_icon_image.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/extension_icon_image.cc
diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc
index 14ba2904016edd51281a38affe55faf01dddbd71..4518cd330738c58465caa7987b6229ba33d00225 100644
--- a/extensions/browser/extension_icon_image.cc
+++ b/extensions/browser/extension_icon_image.cc
@@ -104,7 +104,7 @@ IconImage::Source::~Source() {
}
void IconImage::Source::ResetHost() {
- host_ = NULL;
+ host_ = nullptr;
}
gfx::ImageSkiaRep IconImage::Source::GetImageForScale(float scale) {
@@ -123,19 +123,18 @@ gfx::ImageSkiaRep IconImage::Source::GetImageForScale(float scale) {
////////////////////////////////////////////////////////////////////////////////
// IconImage
-IconImage::IconImage(
- content::BrowserContext* context,
- const Extension* extension,
- const ExtensionIconSet& icon_set,
- int resource_size_in_dip,
- const gfx::ImageSkia& default_icon,
- Observer* observer)
+IconImage::IconImage(content::BrowserContext* context,
+ const Extension* extension,
+ const ExtensionIconSet& icon_set,
+ int resource_size_in_dip,
+ const gfx::ImageSkia& default_icon,
+ Observer* observer)
: browser_context_(context),
extension_(extension),
icon_set_(icon_set),
resource_size_in_dip_(resource_size_in_dip),
observer_(observer),
- source_(NULL),
+ source_(nullptr),
default_icon_(gfx::ImageSkiaOperations::CreateResizedImage(
default_icon,
skia::ImageOperations::RESIZE_BEST,
@@ -228,7 +227,7 @@ void IconImage::Observe(int type,
const Extension* extension = content::Details<const Extension>(details).ptr();
if (extension_ == extension)
- extension_ = NULL;
+ extension_ = nullptr;
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698