diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 18:09:27 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 18:09:27 +0000 |
| commit | 77e507c427910bda121ed901a06644f696c7d370 (patch) | |
| tree | b03bdd67a2749a78fab319ccc5e302a462e58fb3 /chrome/chrome.gyp | |
| parent | 6793a13ae2d9c8570500ce3cc330ede1a556d9ce (diff) | |
| download | chromium_src-77e507c427910bda121ed901a06644f696c7d370.zip chromium_src-77e507c427910bda121ed901a06644f696c7d370.tar.gz chromium_src-77e507c427910bda121ed901a06644f696c7d370.tar.bz2 | |
Merge 32341 - Drag and drop of buttons/folders from bar to bar.
Does not include DnD to/from menus.
No animations of drop destination yet.
BUG=http://crbug.com/17608
TEST=Do some draggin and droppin.
Confirm click still works on the marks and folders.
Confirm "other bookmarks" canNOT be moved.
Confirm NTP / detached bar also works for DnD.
Review URL: http://codereview.chromium.org/395031
TBR=jrg@chromium.org
Review URL: http://codereview.chromium.org/404031
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rwxr-xr-x | chrome/chrome.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index a074b7a..f000496 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1079,6 +1079,8 @@ 'browser/cocoa/bookmark_bar_toolbar_view.mm', 'browser/cocoa/bookmark_bubble_controller.h', 'browser/cocoa/bookmark_bubble_controller.mm', + 'browser/cocoa/bookmark_button.h', + 'browser/cocoa/bookmark_button.mm', 'browser/cocoa/bookmark_button_cell.h', 'browser/cocoa/bookmark_button_cell.mm', 'browser/cocoa/bookmark_editor_base_controller.h', @@ -3276,7 +3278,7 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', - # TODO(yaar): Should only stop depending on webcore and depend + # TODO(yaar): Should only stop depending on webcore and depend # only on webkit. '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', @@ -4559,6 +4561,7 @@ 'browser/cocoa/bookmark_bar_toolbar_view_unittest.mm', 'browser/cocoa/bookmark_bar_view_unittest.mm', 'browser/cocoa/bookmark_bubble_controller_unittest.mm', + 'browser/cocoa/bookmark_button_unittest.mm', 'browser/cocoa/bookmark_button_cell_unittest.mm', 'browser/cocoa/bookmark_editor_base_controller_unittest.mm', 'browser/cocoa/bookmark_editor_controller_unittest.mm', |