Support buttons attribute for drag event (chromium side).

ui/views/widget/desktop_aura/desktop_drop_target_win.cc

 // Copyright (c) 2011 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 "ui/views/widget/desktop_aura/desktop_drop_target_win.h"
 
 #include "base/metrics/histogram.h"
 #include "base/win/win_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drop_target_event.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/events/event_constants.h"
 #include "ui/wm/public/drag_drop_client.h"
 #include "ui/wm/public/drag_drop_delegate.h"
 
 using aura::client::DragDropClient;
 using aura::client::DragDropDelegate;
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderWin;
 
+namespace {
+
+int ConvertKeyStateToAuraEventFlags(DWORD key_state)
+{
+  int flags = 0;
+
+  if (key_state & MK_CONTROL)
+    flags |= ui::EF_CONTROL_DOWN;
+  if (key_state & MK_ALT)
+    flags |= ui::EF_ALT_DOWN;
+  if (key_state & MK_SHIFT)
+    flags |= ui::EF_SHIFT_DOWN;
+  if (key_state & MK_LBUTTON)
+    flags |= ui::EF_LEFT_MOUSE_BUTTON;
+  if (key_state & MK_MBUTTON)
+    flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
+  if (key_state & MK_RBUTTON)
+    flags |= ui::EF_RIGHT_MOUSE_BUTTON;
+
+  return flags;
+}
+
+} // namespace

[Avi (use Gerrit), 2015/03/11 02:08:15]

ditto

+
 namespace views {
 
 DesktopDropTargetWin::DesktopDropTargetWin(aura::Window* root_window,
                                            HWND window)
     : ui::DropTargetWin(window),
       root_window_(root_window),
       target_window_(NULL) {
 }
 
 DesktopDropTargetWin::~DesktopDropTargetWin() {
@@ skipping 92 matching lines @@
     return;
 
   data->reset(new OSExchangeData(new OSExchangeDataProviderWin(data_object)));
   location = root_location;
   aura::Window::ConvertPointToTarget(root_window_, target_window_, &location);
   event->reset(new ui::DropTargetEvent(
       *(data->get()),
       location,
       root_location,
       ui::DragDropTypes::DropEffectToDragOperation(effect)));
-  int flags = 0;
-  flags |= base::win::IsAltPressed() ? ui::EF_ALT_DOWN : ui::EF_NONE;
-  flags |= base::win::IsShiftPressed() ? ui::EF_SHIFT_DOWN : ui::EF_NONE;
-  flags |= base::win::IsCtrlPressed() ? ui::EF_CONTROL_DOWN : ui::EF_NONE;
-  (*event)->set_flags(flags);
+  (*event)->set_flags(ConvertKeyStateToAuraEventFlags(key_state));
   if (target_window_changed)
     (*delegate)->OnDragEntered(*event->get());
 }
 
 void DesktopDropTargetWin::NotifyDragLeave() {
   if (!target_window_)
     return;
   DragDropDelegate* delegate =
       aura::client::GetDragDropDelegate(target_window_);
   if (delegate)
     delegate->OnDragExited();
   target_window_->RemoveObserver(this);
   target_window_ = NULL;
 }
 
 }  // namespace views