diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 20:47:16 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 20:47:16 +0000 |
| commit | f16576d5803e57d36bf625cc3f23c9530f683dcd (patch) | |
| tree | cb303e0af1a7cc5aab63b4367f11ffec060707b5 | |
| parent | 0ef0bcf3eeecc982b549c695902779040c85e0e3 (diff) | |
| download | chromium_src-f16576d5803e57d36bf625cc3f23c9530f683dcd.zip chromium_src-f16576d5803e57d36bf625cc3f23c9530f683dcd.tar.gz chromium_src-f16576d5803e57d36bf625cc3f23c9530f683dcd.tar.bz2 | |
Fixes regression in dragging bookmark bar. The bookmark bar would not
allow drags when on the new tab page.
BUG=9674
TEST=see bug, but make sure dragging from bookmark bar works in all modes.
Review URL: http://codereview.chromium.org/60096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13106 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 8542ab9..36eaa3d 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -1157,8 +1157,9 @@ void BookmarkBarView::WriteDragData(BookmarkNode* node, int BookmarkBarView::GetDragOperations(View* sender, int x, int y) { if (size_animation_->IsAnimating() || - size_animation_->GetCurrentValue() == 0) { - // Don't let the user drag while animating open or we're closed. This + (size_animation_->GetCurrentValue() == 0 && !OnNewTabPage())) { + // Don't let the user drag while animating open or we're closed (and not on + // the new tab page, on the new tab page size_animation_ is always 0). This // typically is only hit if the user does something to inadvertanty trigger // dnd, such as pressing the mouse and hitting control-b. return DragDropTypes::DRAG_NONE; |