diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-06 06:00:58 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-06 06:00:58 +0000 |
| commit | 80a558e8a9953c142c100fcffef50df37949b520 (patch) | |
| tree | 417fd7ee9e079f48c4408c0269c7ab01e5647fcd /ui | |
| parent | 9f147b445af93c27211357ef039111bcc81390bd (diff) | |
| download | chromium_src-80a558e8a9953c142c100fcffef50df37949b520.zip chromium_src-80a558e8a9953c142c100fcffef50df37949b520.tar.gz chromium_src-80a558e8a9953c142c100fcffef50df37949b520.tar.bz2 | |
app_list: Fix sync animation crash.
AppsGridView is used for folder view and it has a NULL item_list_ initially.
This causes a crash when attempting to create pulsing blocks for sync
animation.
BUG=314855
R=jennyz@chromium.org
Review URL: https://codereview.chromium.org/59623005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app_list/views/apps_grid_view.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index d8f92c3..f300de7 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -657,8 +657,9 @@ void AppsGridView::UpdatePaging() { } void AppsGridView::UpdatePulsingBlockViews() { + const int existing_items = item_list_ ? item_list_->item_count() : 0; const int available_slots = - tiles_per_page() - item_list_->item_count() % tiles_per_page(); + tiles_per_page() - existing_items % tiles_per_page(); const int desired = model_->status() == AppListModel::STATUS_SYNCING ? available_slots : 0; |