MacViews: Fix for multiple definitions of chrome::DragBookmarks.
commit72e58e1e8ec284f3589fe9b67251aed751582f76
authorandresantoso <andresantoso@chromium.org>
Wed, 7 Jan 2015 18:04:33 +0000 (7 10:04 -0800)
committerCommit bot <commit-bot@chromium.org>
Wed, 7 Jan 2015 18:05:53 +0000 (7 18:05 +0000)
treed4ff1b105fba8dc4a79f02b93b97e38e8177319d
parent9b9256d9b947be852f236490311801f6e8d0e5eb
MacViews: Fix for multiple definitions of chrome::DragBookmarks.

There are 2 definitions of DragBookmarks, one for Cocoa and one for Views.
We want to link in one or the other, but they live in the same file as other
bookmark related utility functions. These functions are moved somewhere else
so that we can selectively link either bookmark_drag_drop_views.cc or
bookmark_drag_drop_cocoa.mm.

BUG=425229

Review URL: https://codereview.chromium.org/814363002

Cr-Commit-Position: refs/heads/master@{#310318}
13 files changed:
chrome/browser/ui/BUILD.gn
chrome/browser/ui/bookmarks/bookmark_utils.cc
chrome/browser/ui/bookmarks/bookmark_utils.h
chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.h [deleted file]
chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm
chrome/browser/ui/cocoa/drag_util.h
chrome/browser/ui/cocoa/drag_util.mm [copied from chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm with 51% similarity]
chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc
chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h [deleted file]
chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
chrome/chrome_browser_ui.gypi