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

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: Merged & 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
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 e81bfdf1aa8d02add9b10ea78b925744a929a4d3..25619fbfc96484c9dab472b4ee14d97cfcd3293e 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;
koz (OOO until 15th September) 2013/05/08 02:00:39 I don't think we want to set this to NULL because
Mr4D (OOO till 08-26) 2013/05/08 02:53:35 Done.
if (delegate_)
delegate_->Dismiss();
else

Powered by Google App Engine
This is Rietveld 408576698