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 86f42c0511a31f3ad696e99343ea8ab0f8e149b9..dfa88f64627fb7b782eca1590fc8554a78ab151a 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -55,13 +55,13 @@ ContentsView::ContentsView(AppListMainView* app_list_main_view,
       kPageTransitionDurationInMs,
       kOverscrollPageTransitionDurationMs);
 
-  AppsGridView* apps_grid_view = new AppsGridView(app_list_main_view,
+  apps_grid_view_ = new AppsGridView(app_list_main_view,
                                                   pagination_model);

[James Cook, 2013/04/29 22:08:29]

indentation

[Mr4D (OOO till 08-26), 2013/04/30 16:59:01]

Done.

-  apps_grid_view->SetLayout(kPreferredIconDimension,
-                            kPreferredCols,
-                            kPreferredRows);
-  AddChildView(apps_grid_view);
-  view_model_->Add(apps_grid_view, kIndexAppsGrid);
+  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);
@@ -82,6 +82,10 @@ void ContentsView::SetModel(AppListModel* model) {
   }
 }
 
+void ContentsView::SetAppListDnDHost(app_list::ApplicationDnDHost* dnd_host) {
+  apps_grid_view_->SetAppListDnDHost(dnd_host);
+}
+
 void ContentsView::SetShowState(ShowState show_state) {
   if (show_state_ == show_state)
     return;