Drag and drop between app list and launcher - First patch

ui/app_list/views/contents_view.h

Index: ui/app_list/views/contents_view.h
diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h
index 131481c9f25d6abec09c9252cfc8d7daa59017eb..f9f31ab00b3f889677e7aa1a8bbd15434c95f455 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -17,6 +17,8 @@ class ViewModel;
 
 namespace app_list {
 
+class AppsGridView;
+class ApplicationDragAndDropHost;
 class AppListMainView;
 class AppListModel;
 class PaginationModel;
@@ -33,6 +35,11 @@ class ContentsView : public views::View {
 
   void SetModel(AppListModel* model);
 
+  // If |drag_and_drop| is not NULL it will be called upon drag and drop
+  // operations outside the application list.
+  void SetDragAndDropHostOfCurrentAppList(
+      app_list::ApplicationDragAndDropHost* drag_and_drop_host);
+
   void ShowSearchResults(bool show);
 
   void Prerender();
@@ -65,6 +72,8 @@ class ContentsView : public views::View {
   ShowState show_state_;
   PaginationModel* pagination_model_;  // Owned by AppListController.
 
+  AppsGridView* apps_grid_view_;  // Owned by the view.
+
   scoped_ptr<views::ViewModel> view_model_;
   scoped_ptr<views::BoundsAnimator> bounds_animator_;