Drag and drop between app list and launcher - First patch

ui/app_list/views/contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/contents_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/pagination_model.h"
@@ skipping 37 matching lines @@
                            PaginationModel* pagination_model)
     : show_state_(SHOW_APPS),
       pagination_model_(pagination_model),
       view_model_(new views::ViewModel),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           bounds_animator_(new views::BoundsAnimator(this))) {
   pagination_model_->SetTransitionDurations(
       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);
   AddChildView(search_results_view);
   view_model_->Add(search_results_view, kIndexSearchResults);
 }
 
 ContentsView::~ContentsView() {
 }
 
 void ContentsView::SetModel(AppListModel* model) {
   if (model) {
     GetAppsGridView(view_model_.get())->SetModel(model);
     GetSearchResultListView(view_model_.get())->SetResults(model->results());
   } else {
     GetAppsGridView(view_model_.get())->SetModel(NULL);
     GetSearchResultListView(view_model_.get())->SetResults(NULL);
   }
 }
 
+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;
 
   show_state_ = show_state;
   ShowStateChanged();
 }
 
 void ContentsView::ShowStateChanged() {
   if (show_state_ == SHOW_SEARCH_RESULTS) {
@@ skipping 138 matching lines @@
 
   if (!pagination_model_->has_transition()) {
     pagination_model_->SelectPageRelative(event->x_offset() > 0 ? -1 : 1,
                                           true);
   }
   event->SetHandled();
   event->StopPropagation();
 }
 
 }  // namespace app_list