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

Unified Diff: ui/app_list/app_list_folder_item.cc

Issue 220393003: Add a unit test for resetting the app list on a reshow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trent_whole_app_list_unit_test
Patch Set: fix NULL icon cases for app list folders Created 6 years, 7 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
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/app_list/test/app_list_test_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_folder_item.cc
diff --git a/ui/app_list/app_list_folder_item.cc b/ui/app_list/app_list_folder_item.cc
index 8a2080399ba19afabb15d415e3d8b2db99f69bb5..9554086bc82aa92b620123970764cc2ee7d8159e 100644
--- a/ui/app_list/app_list_folder_item.cc
+++ b/ui/app_list/app_list_folder_item.cc
@@ -36,6 +36,9 @@ class FolderImageSource : public gfx::CanvasImageSource {
const gfx::ImageSkia& icon,
const gfx::Size icon_size,
int x, int y) {
+ if (icon.isNull())
+ return;
+
gfx::ImageSkia resized(
gfx::ImageSkiaOperations::CreateResizedImage(
icon, skia::ImageOperations::RESIZE_BEST, icon_size));
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/app_list/test/app_list_test_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698