Drag and drop between app list and launcher - First patch

ui/app_list/views/apps_grid_view.cc

Index: ui/app_list/views/apps_grid_view.cc
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc
index 9cfe08e90a6c23c470d7f2165055be563ce6621c..a9feb96212d539a88e23fe7eb20dba4cb48eb8e1 100644
--- a/ui/app_list/views/apps_grid_view.cc
+++ b/ui/app_list/views/apps_grid_view.cc
@@ -6,8 +6,10 @@
 
 #include <algorithm>
 
+#include "ui/app_list/app_list_item_model.h"
 #include "ui/app_list/apps_grid_view_delegate.h"
 #include "ui/app_list/pagination_model.h"
+#include "ui/app_list/views/app_list_drag_and_drop_host.h"
 #include "ui/app_list/views/app_list_item_view.h"
 #include "ui/app_list/views/page_switcher.h"
 #include "ui/app_list/views/pulsing_block_view.h"
@@ -108,6 +110,8 @@ AppsGridView::AppsGridView(AppsGridViewDelegate* delegate,
       selected_view_(NULL),
       drag_view_(NULL),
       drag_pointer_(NONE),
+      drag_and_drop_host_(NULL),
+      drag_and_drop_host_dispatched_drag_(false),
       page_flip_target_(-1),
       page_flip_delay_in_ms_(kPageFlipDelayInMs),
       bounds_animator_(this) {
@@ -177,7 +181,7 @@ void AppsGridView::EnsureViewVisible(const views::View* view) {
     pagination_model_->SelectPage(index.page, false);
 }
 
-void AppsGridView::InitiateDrag(views::View* view,
+void AppsGridView::InitiateDrag(AppListItemView* view,
                                 Pointer pointer,
                                 const ui::LocatedEvent& event) {
   if (drag_view_ || pulsing_blocks_model_.view_size())
@@ -187,7 +191,7 @@ void AppsGridView::InitiateDrag(views::View* view,
   drag_start_ = event.location();
 }
 
-void AppsGridView::UpdateDrag(views::View* view,
+void AppsGridView::UpdateDrag(AppListItemView* view,
                               Pointer pointer,
                               const ui::LocatedEvent& event) {
   if (!dragging() && drag_view_ &&
@@ -200,6 +204,9 @@ void AppsGridView::UpdateDrag(views::View* view,
   if (drag_pointer_ != pointer)
     return;
 
+  // If a drag and drop host is provided, see if the drag operation needs to be
+  // forwarded.
+  DispatchDragEventToDragAndDropHost(event);
   ExtractDragLocation(event, &last_drag_point_);
 
   const Index last_drop_target = drop_target_;
@@ -218,7 +225,10 @@ void AppsGridView::UpdateDrag(views::View* view,
 }
 
 void AppsGridView::EndDrag(bool cancel) {
-  if (!cancel && dragging() && drag_view_) {
+  if (drag_and_drop_host_dispatched_drag_) {
+    drag_and_drop_host_dispatched_drag_ = false;
+    drag_and_drop_host_->EndDrag(cancel);
+  } else if (!cancel && dragging() && drag_view_) {
     CalculateDropTarget(last_drag_point_, true);
     if (IsValidIndex(drop_target_))
       MoveItemInModel(drag_view_, drop_target_);
@@ -239,6 +249,11 @@ bool AppsGridView::IsDraggedView(const views::View* view) const {
   return drag_view_ == view;
 }
 
+void AppsGridView::SetDragAndDropHostOfCurrentAppList(
+    ApplicationDragAndDropHost* drag_and_drop_host) {
+  drag_and_drop_host_ = drag_and_drop_host;
+}
+
 void AppsGridView::Prerender(int page_index) {
   Layout();
   int start = std::max(0, (page_index - kPrerenderPages) * tiles_per_page());
@@ -659,6 +674,40 @@ void AppsGridView::CalculateDropTarget(const gfx::Point& drag_point,
   }
 }
 
+void AppsGridView::DispatchDragEventToDragAndDropHost(
+    const ui::LocatedEvent& event) {
+  if (!drag_view_ || !drag_and_drop_host_)
+    return;
+  if (bounds().Contains(last_drag_point_)) {
+    // The event was issued inside the app menu and we should get all events.
+    if (drag_and_drop_host_dispatched_drag_) {
+      // The DnD host was previously called and needs to be informed that the
+      // session returns to the owner.
+      drag_and_drop_host_dispatched_drag_ = false;
+      drag_and_drop_host_->EndDrag(true);
+    }
+  } else {
+    // The event happened outside our app menu and we might need to dispatch.
+    if (drag_and_drop_host_dispatched_drag_) {
+      // Dispatch since we have already started.
+      if (!drag_and_drop_host_->Drag(event.root_location())) {
+        // The host is not active any longer and we cancel the operation.
+        drag_and_drop_host_dispatched_drag_ = false;
+        drag_and_drop_host_->EndDrag(true);
+      }
+    } else {
+      if (drag_and_drop_host_->StartDrag(drag_view_->model()->app_id(),
+                               event.root_location())) {

[James Cook, 2013/04/30 18:03:00]

nit: indentation

[Mr4D (OOO till 08-26), 2013/04/30 18:22:48]

Done.

+        // From now on we forward the drag events.
+        drag_and_drop_host_dispatched_drag_ = true;
+        // Any flip operations are stopped.
+        page_flip_timer_.Stop();
+        page_flip_target_ = -1;
+      }
+    }
+  }
+}
+
 void AppsGridView::MaybeStartPageFlipTimer(const gfx::Point& drag_point) {
   int new_page_flip_target = -1;