Cleanup ash-based code for Windows drag-and-drop graphics

Desktop / Chromium - danakj [chromium.org] - 19 April 2017 13:26 EDT

This moves the windows-specific implementation into the window OSExchangeData::Provider. Since there's no ash that code does not need to handle both anymore.

On windows+mus we use a OSExchangeDataProviderMus in the UI process instead, which will do the right thing (the same thing that drag_utils used to do instead of calling to the OSExchangeData::Provider).

Changes the return type of GetDrawImage{Offset} to be more friendly to implementations that do not return a ref to a member variable.

R=sadrul@chromium.org

Review-Url: https://codereview.chromium.org/2792183002 Cr-Commit-Position: refs/heads/master@{#465653}

e100d02 Cleanup ash-based code for Windows drag-and-drop graphics.
ash/drag_drop/drag_drop_controller_unittest.cc | 4 +-
.../ui/views/bookmarks/bookmark_bar_view.cc | 1 -
.../ui/views/toolbar/browser_actions_container.cc | 6 +-
.../browser/web_contents/web_contents_view_aura.cc | 3 +-
ui/app_list/views/app_list_item_view.cc | 1 -
ui/aura/mus/os_exchange_data_provider_mus.cc | 4 +-
ui/aura/mus/os_exchange_data_provider_mus.h | 4 +-
ui/base/BUILD.gn | 14 ----
ui/base/dragdrop/drag_utils.cc | 19 -----
ui/base/dragdrop/drag_utils.h | 29 --------
ui/base/dragdrop/drag_utils_win.cc | 87 ----------------------
ui/base/dragdrop/os_exchange_data.h | 4 +-
ui/base/dragdrop/os_exchange_data_provider_aura.cc | 5 +-
ui/base/dragdrop/os_exchange_data_provider_aura.h | 4 +-
.../dragdrop/os_exchange_data_provider_aurax11.cc | 4 +-
.../dragdrop/os_exchange_data_provider_aurax11.h | 4 +-
ui/base/dragdrop/os_exchange_data_provider_mac.h | 4 +-
ui/base/dragdrop/os_exchange_data_provider_mac.mm | 4 +-
ui/base/dragdrop/os_exchange_data_provider_win.cc | 80 +++++++++++++++++---
ui/base/dragdrop/os_exchange_data_provider_win.h | 10 +--
ui/views/button_drag_utils.cc | 3 +-
ui/views/controls/menu/menu_controller.cc | 4 +-
ui/views/controls/textfield/textfield.cc | 3 +-
23 files changed, 99 insertions(+), 202 deletions(-)

Upstream: git.chromium.org


  • Share