Drag and drop between app list and launcher - First patch

ui/app_list/views/contents_view.cc

Index: ui/app_list/views/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 6abda38e0e3efbc37035aef8ecc81afe7148e65f..bbde3d9ed4aab9c341613bbf90e52f528935fd34 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -54,13 +54,12 @@ ContentsView::ContentsView(AppListMainView* app_list_main_view,
       kPageTransitionDurationInMs,
       kOverscrollPageTransitionDurationMs);
 
-  AppsGridView* apps_grid_view = new AppsGridView(app_list_main_view,
-                                                  pagination_model);
-  apps_grid_view->SetLayout(kPreferredIconDimension,
-                            kPreferredCols,
-                            kPreferredRows);
-  AddChildView(apps_grid_view);
-  view_model_->Add(apps_grid_view, kIndexAppsGrid);
+  apps_grid_view_ = new AppsGridView(app_list_main_view, pagination_model);
+  apps_grid_view_->SetLayout(kPreferredIconDimension,
+                             kPreferredCols,
+                             kPreferredRows);
+  AddChildView(apps_grid_view_);
+  view_model_->Add(apps_grid_view_, kIndexAppsGrid);
 
   SearchResultListView* search_results_view = new SearchResultListView(
       app_list_main_view);
@@ -81,6 +80,11 @@ void ContentsView::SetModel(AppListModel* model) {
   }
 }
 
+void ContentsView::SetDragAndDropHostOfCurrentAppList(
+    app_list::ApplicationDragAndDropHost* drag_and_drop_host) {
+  apps_grid_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
+}
+
 void ContentsView::SetShowState(ShowState show_state) {
   if (show_state_ == show_state)
     return;