mus drag and drop: return the completed effect to the caller.

services/ui/ws/drag_controller.cc

 // Copyright 2016 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 "services/ui/ws/drag_controller.h"
 
 #include "base/logging.h"
 #include "services/ui/ws/drag_source.h"
 #include "services/ui/ws/drag_target_connection.h"
 #include "services/ui/ws/event_dispatcher.h"
@@ skipping 39 matching lines @@
 }
 
 DragController::~DragController() {
   for (auto& pair : window_state_) {
     if (pair.second.observed)
       pair.first->RemoveObserver(this);
   }
 }
 
 void DragController::Cancel() {
-  MessageDragCompleted(false);
+  MessageDragCompleted(false, ui::mojom::kDropEffectNone);
   // |this| may be deleted now.
 }
 
 bool DragController::DispatchPointerEvent(const ui::PointerEvent& event,
                                           ServerWindow* current_target) {
   uint32_t event_flags =
       event.flags() &
       (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN);
   gfx::Point screen_position = event.location();
 
@@ skipping 39 matching lines @@
   }
 
   if (event.type() == ET_POINTER_UP) {
     if (current_target) {
       QueueOperation(current_target, OperationType::DROP, event_flags,
                      screen_position);
       waiting_for_final_drop_response_ = true;
     } else {
       // The pointer was released over no window or a window that doesn't
       // accept drags.
-      MessageDragCompleted(false);
+      MessageDragCompleted(false, ui::mojom::kDropEffectNone);
     }
   }
 
   return true;
 }
 
 void DragController::OnWillDestroyDragTargetConnection(
     DragTargetConnection* connection) {
   called_on_drag_mime_types_.erase(connection);
 }
 
-void DragController::MessageDragCompleted(bool success) {
+void DragController::MessageDragCompleted(bool success, uint32_t action_taken) {
   for (DragTargetConnection* connection : called_on_drag_mime_types_)
     connection->PerformOnDragDropDone();
   called_on_drag_mime_types_.clear();
 
-  source_->OnDragCompleted(success);
+  source_->OnDragCompleted(success, action_taken);
   // |this| may be deleted now.
 }
 
 size_t DragController::GetSizeOfQueueForWindow(ServerWindow* window) {
   auto it = window_state_.find(window);
   if (it == window_state_.end())
     return 0u;
   if (it->second.waiting_on_reply == OperationType::NONE)
     return 0u;
   if (it->second.queued_operation.type == OperationType::NONE)
@@ skipping 100 matching lines @@
     return;
   }
 
   // We must remove the completed item.
   OnRespondToOperation(window);
 
   // TODO(erg): |bitmask| is the allowed drag actions at the mouse location. We
   // should use this data to change the cursor.
 }
 
-void DragController::OnDragDropCompleted(const WindowId& id, uint32_t bitmask) {
+void DragController::OnDragDropCompleted(const WindowId& id, uint32_t action) {
   ServerWindow* window = source_->GetWindowById(id);
   if (!window) {
     // The window has been deleted after we sent the drop message. It's really
     // hard to recover from this so just signal to the source that our drag
     // failed.
-    MessageDragCompleted(false);
+    MessageDragCompleted(false, ui::mojom::kDropEffectNone);
     return;
   }
 
   OnRespondToOperation(window);
-  MessageDragCompleted(bitmask != 0u);
+  MessageDragCompleted(action != 0u, action);
 }
 
 void DragController::OnWindowDestroying(ServerWindow* window) {
   auto it = window_state_.find(window);
   if (it != window_state_.end()) {
     window->RemoveObserver(this);
     window_state_.erase(it);
   }
 
   if (current_target_window_ == window)
     current_target_window_ = nullptr;
 
   if (source_window_ == window) {
     source_window_ = nullptr;
     // Our source window is being deleted, fail the drag.
-    MessageDragCompleted(false);
+    MessageDragCompleted(false, ui::mojom::kDropEffectNone);
   }
 }
 
 }  // namespace ws
 }  // namespace ui