| 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
|
|
|