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

Unified Diff: ui/app_list/apps_grid_view.cc

Issue 11418312: app_list: Improve initial icon loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, stop timer when showing widget because no pending icon loads Created 8 years 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_view.cc ('k') | ui/app_list/contents_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/apps_grid_view.cc
diff --git a/ui/app_list/apps_grid_view.cc b/ui/app_list/apps_grid_view.cc
index f4e5eb3376c0eefce11a00ab0b6e3dfbfc2215cc..e3801e42fa95ceeed0ffa7e2c4e79b7fd55d2b23 100644
--- a/ui/app_list/apps_grid_view.cc
+++ b/ui/app_list/apps_grid_view.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "ui/app_list/app_list_item_model.h"
#include "ui/app_list/app_list_item_view.h"
#include "ui/app_list/apps_grid_view_delegate.h"
#include "ui/app_list/page_switcher.h"
@@ -323,7 +322,8 @@ void AppsGridView::ViewHierarchyChanged(bool is_add,
}
void AppsGridView::Update() {
- selected_view_ = NULL;
+ DCHECK(!selected_view_ && !drag_view_);
+
view_model_.Clear();
if (model_ && model_->apps()->item_count())
ListItemsAdded(0, model_->apps()->item_count());
« no previous file with comments | « ui/app_list/app_list_view.cc ('k') | ui/app_list/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698