diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index f73b777..5c95b08 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -1167,6 +1167,14 @@ 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 + // 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; + } + for (int i = 0; i < GetBookmarkButtonCount(); ++i) { if (sender == GetBookmarkButton(i)) { return bookmark_utils::BookmarkDragOperation( |