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

Unified Diff: ui/app_list/views/app_list_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: Another merge conflict. Wonder why I was able to compile though. Created 7 years, 8 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
Index: ui/app_list/views/app_list_view.cc
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index b63cc27f6b0098f8e1087cedc827ecb837a01d90..0bb9534ee0453c0de0bc5195cd15e47b3bf02eb5 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -128,13 +128,19 @@ void AppListView::SetAnchorPoint(const gfx::Point& anchor_point) {
SizeToContents(); // Repositions view relative to the anchor.
}
+void AppListView::SetDragAndDropHostOfCurrentAppList(
+ app_list::ApplicationDragAndDropHost* drag_and_drop_host) {
+ CHECK(app_list_main_view_);
+ app_list_main_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
+}
+
void AppListView::ShowWhenReady() {
app_list_main_view_->ShowAppListWhenReady();
}
void AppListView::Close() {
app_list_main_view_->Close();
-
+ app_list_main_view_ = NULL;
if (delegate_)
delegate_->Dismiss();
else

Powered by Google App Engine
This is Rietveld 408576698