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

Unified Diff: ui/app_list/views/app_list_main_view.cc

Issue 2304233002: [Merge-M53] arc: Open launcher after installing app from Android (Closed)
Patch Set: resolve browser_tests Created 4 years, 3 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/views/app_list_main_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_main_view.cc
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
index 20ec0975be727ed93c483a0de1b6d5d2aa8ed883..ac8c4ea6ab3d111b5130fe11f00cc19ea08af584 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -68,7 +68,12 @@ class AppListMainView::IconLoader : public AppListItemObserver {
private:
// AppListItemObserver overrides:
void ItemIconChanged() override {
- owner_->OnItemIconLoaded(this);
+ owner_->OnIconLoaderFinished(this);
+ // Note that IconLoader is released here.
+ }
+
+ void ItemBeingDestroyed() override {
+ owner_->OnIconLoaderFinished(this);
// Note that IconLoader is released here.
}
@@ -225,7 +230,7 @@ void AppListMainView::OnIconLoadingWaitTimer() {
GetWidget()->Show();
}
-void AppListMainView::OnItemIconLoaded(IconLoader* loader) {
+void AppListMainView::OnIconLoaderFinished(IconLoader* loader) {
ScopedVector<IconLoader>::iterator it = std::find(
pending_icon_loaders_.begin(), pending_icon_loaders_.end(), loader);
DCHECK(it != pending_icon_loaders_.end());
« no previous file with comments | « ui/app_list/views/app_list_main_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698