athena/extensions/extension_app_model_builder.cc - Issue 653563004: NULL -> nullptr under athena/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: athena/extensions/extension_app_model_builder.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 6 years, 2 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:

Index: athena/extensions/extension_app_model_builder.cc

diff --git a/athena/extensions/extension_app_model_builder.cc b/athena/extensions/extension_app_model_builder.cc

index 411c8b8690b5ccfacf79a235881049a1dd1d7026..88d89f1ccf821c76cb4b178fcee36daedc347d49 100644

--- a/athena/extensions/extension_app_model_builder.cc

+++ b/athena/extensions/extension_app_model_builder.cc

@@ -44,7 +44,7 @@ class AppItem : public app_list::AppListItem {

extension_misc::EXTENSION_ICON_MEDIUM,

*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

IDR_APP_DEFAULT_ICON),

- NULL));

+ nullptr));

icon_image_->image_skia().EnsureRepsForSupportedScales();

SetIcon(icon_image_->image_skia(), false);

SetName(extension->name());