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

Unified Diff: ash/wm/app_list_controller.cc

Issue 508813002: Move ownership of the AppListViewDelegate into the AppListService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comments Created 6 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 | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/app_list/app_list_service_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/app_list_controller.cc
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
index 515930507524e271db77b1229ca0f4c2a70ea10a..382ad107a4803778194cd666e7823a2136f2b0ad 100644
--- a/ash/wm/app_list_controller.cc
+++ b/ash/wm/app_list_controller.cc
@@ -187,10 +187,10 @@ void AppListController::Show(aura::Window* window) {
if (view_) {
ScheduleAnimation();
} else {
- // AppListModel and AppListViewDelegate are owned by AppListView. They
- // will be released with AppListView on close.
+ // Note the AppListViewDelegate outlives the AppListView. For Ash, the view
+ // is destroyed when dismissed.
app_list::AppListView* view = new app_list::AppListView(
- Shell::GetInstance()->delegate()->CreateAppListViewDelegate());
+ Shell::GetInstance()->delegate()->GetAppListViewDelegate());
aura::Window* root_window = window->GetRootWindow();
aura::Window* container = GetRootWindowController(root_window)->
GetContainer(kShellWindowId_AppListContainer);
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/app_list/app_list_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698