Merge 13106 - Fixes regression in dragging bookmark bar. The bookmark bar wou...

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "base/string_util.h"
 #include "base/base_drag_source.h"
@@ skipping 1139 matching lines @@
 
 void BookmarkBarView::WriteDragData(BookmarkNode* node,
                                     OSExchangeData* data) {
   DCHECK(node && data);
   BookmarkDragData drag_data(node);
   drag_data.Write(profile_, data);
 }
 
 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;
   }
 
   for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
     if (sender == GetBookmarkButton(i)) {
       return bookmark_utils::BookmarkDragOperation(
           model_->GetBookmarkBarNode()->GetChild(i));
     }
@@ skipping 474 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }