MacViews: Implemented Drag & Drop

ui/views/cocoa/bridged_content_view.mm

 // Copyright 2014 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.
 
 #import "ui/views/cocoa/bridged_content_view.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_mac.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/compositor/canvas_painter.h"
 #import "ui/events/cocoa/cocoa_event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 #include "ui/gfx/canvas_paint_mac.h"
 #include "ui/gfx/geometry/rect.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/path.h"
 #import "ui/gfx/path_mac.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/strings/grit/ui_strings.h"
+#import "ui/views/cocoa/bridged_native_widget.h"
+#include "ui/views/cocoa/drag_drop_client_mac.h"

[tapted, 2016/05/31 11:49:58]

nit: import

[spqchan, 2016/05/31 23:06:12]

Done.

 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/view.h"
+#include "ui/views/widget/native_widget_mac.h"
 #include "ui/views/widget/widget.h"
 
 using views::MenuController;
 
 namespace {
 
 NSString* const kFullKeyboardAccessChangedNotification =
     @"com.apple.KeyboardUIModeDidChange";
 
 // Returns true if all four corners of |rect| are contained inside |path|.
@@ skipping 179 matching lines @@
 // `plutil -convert xml1 -o StandardKeyBinding.xml StandardKeyBinding.dict` to
 // get something readable.
 - (void)handleAction:(int)commandId
              keyCode:(ui::KeyboardCode)keyCode
              domCode:(ui::DomCode)domCode
           eventFlags:(int)eventFlags;
 
 // Notification handler invoked when the Full Keyboard Access mode is changed.
 - (void)onFullKeyboardAccessModeChanged:(NSNotification*)notification;
 
+- (views::DragDropClientMac*)dragDropClient;
+
 // Menu action handlers.
 - (void)undo:(id)sender;
 - (void)redo:(id)sender;
 - (void)cut:(id)sender;
 - (void)copy:(id)sender;
 - (void)paste:(id)sender;
 - (void)selectAll:(id)sender;
 
 @end
 
@@ skipping 28 matching lines @@
     [[NSDistributedNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(onFullKeyboardAccessModeChanged:)
                name:kFullKeyboardAccessChangedNotification
              object:nil];
 
     // Initialize the focus manager with the correct keyboard accessibility
     // setting.
     [self updateFullKeyboardAccess];
   }
+
+  [self registerForDraggedTypes:ui::OSExchangeDataProviderMac::

[tapted, 2016/05/31 11:49:57]

nit: move this into the if {}

[spqchan, 2016/05/31 23:06:12]

Done.

+                                    SupportedPasteboardTypes()];
+
   return self;
 }
 
 - (void)clearView {
   textInputClient_ = nullptr;
   hostedView_ = nullptr;
   [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
   [cursorTrackingArea_.get() clearOwner];
   [self removeTrackingArea:cursorTrackingArea_.get()];
 }
@@ skipping 11 matching lines @@
     [self mouseEvent:theEvent];
     return;
   }
 
   ui::MouseEvent event(theEvent);
   event.set_location(
       MovePointToWindow([theEvent locationInWindow], source, target));
   hostedView_->GetWidget()->OnMouseEvent(&event);
 }
 
+- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender {

[tapted, 2016/05/31 11:49:57]

nit: these should move down after the other NSView overrides - probably
immediately before the NSTextInputClient protocol implementation, and be
proceeded by

// NSDraggingDestination protocol overrides:

[spqchan, 2016/05/31 23:06:12]

Done.

+  return [self draggingUpdated:sender];
+}
+
+- (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender {
+  views::DragDropClientMac* client = [self dragDropClient];
+  return client ? client->DragUpdate(sender) : ui::DragDropTypes::DRAG_NONE;
+}
+
+- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
+  views::DragDropClientMac* client = [self dragDropClient];
+  if (client)
+    return client->Drop(sender) != NSDragOperationNone;
+
+  return NO;

[tapted, 2016/05/31 11:49:57]

nit: we can do just

return client && client->Drop(sender) != NSDragOperationNone;

(sorry - should have noticed this before)

[spqchan, 2016/05/31 23:06:12]

Done.

+}
+
 - (void)updateTooltipIfRequiredAt:(const gfx::Point&)locationInContent {
   DCHECK(hostedView_);
   base::string16 newTooltipText;
 
   views::View* view = hostedView_->GetTooltipHandlerForPoint(locationInContent);
   if (view) {
     gfx::Point viewPoint = locationInContent;
     views::View::ConvertPointToTarget(hostedView_, view, &viewPoint);
     if (!view->GetTooltipText(viewPoint, &newTooltipText))
       DCHECK(newTooltipText.empty());
@@ skipping 72 matching lines @@
   ui::KeyEvent event(ui::ET_KEY_PRESSED, keyCode, domCode, eventFlags);
   hostedView_->GetWidget()->GetInputMethod()->DispatchKeyEvent(&event);
 }
 
 - (void)onFullKeyboardAccessModeChanged:(NSNotification*)notification {
   DCHECK([[notification name]
       isEqualToString:kFullKeyboardAccessChangedNotification]);
   [self updateFullKeyboardAccess];
 }
 
+- (views::DragDropClientMac*)dragDropClient {
+  views::BridgedNativeWidget* bridge =
+      views::NativeWidgetMac::GetBridgeForNativeWindow([self window]);
+  return bridge ? bridge->drag_drop_client() : nullptr;
+}
+
 - (void)undo:(id)sender {
   // This DCHECK is more strict than a similar check in handleAction:. It can be
   // done here because the actors sending these actions should be calling
   // validateUserInterfaceItem: before enabling UI that allows these messages to
   // be sent. Checking it here would be too late to provide correct UI feedback
   // (e.g. there will be no "beep").
   DCHECK(textInputClient_->IsEditCommandEnabled(IDS_APP_UNDO));
   [self handleAction:IDS_APP_UNDO
              keyCode:ui::VKEY_Z
              domCode:ui::DomCode::US_Z
@@ skipping 775 matching lines @@
     return @[ hostedView_->GetNativeViewAccessible() ];
   }
 
   return [super accessibilityAttributeValue:attribute];
 }
 
 - (id)accessibilityHitTest:(NSPoint)point {
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
+// NSDraggingSource protocol implementation

[tapted, 2016/05/31 11:49:57]

nit: move this up, to come after NSUserInterfaceValidations

[spqchan, 2016/05/31 23:06:12]

Done.

+
+- (NSDragOperation)draggingSession:(NSDraggingSession*)session
+    sourceOperationMaskForDraggingContext:(NSDraggingContext)context {
+  return NSDragOperationEvery;
+}
+
+- (void)draggingSession:(NSDraggingSession*)session
+           endedAtPoint:(NSPoint)screenPoint
+              operation:(NSDragOperation)operation {
+  views::DragDropClientMac* client = [self dragDropClient];
+  if (client)
+    client->EndDrag();
+}
+
 @end