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

Unified Diff: ui/app_list/views/contents_view.cc

Issue 14533006: Drag and drop between app list and launcher - First patch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Created 7 years, 7 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
« ash/launcher/launcher_view.cc ('K') | « ui/app_list/views/contents_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e256f4bc37faa6251329d3f23a60bbf2861ff9ed..77c8fb0d10d4449e6a197739c7357678e5902c00 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;
« ash/launcher/launcher_view.cc ('K') | « ui/app_list/views/contents_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698