Revert 49986 - crash

chrome/browser/cocoa/bookmark_bar_folder_controller.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/bookmark_bar_folder_controller.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ skipping 1007 matching lines @@
 // TODO(jrg): ARGH more code dup.
 // http://crbug.com/35966
 - (BOOL)dragButton:(BookmarkButton*)sourceButton
                 to:(NSPoint)point
               copy:(BOOL)copy {
   DCHECK([sourceButton isKindOfClass:[BookmarkButton class]]);
   const BookmarkNode* sourceNode = [sourceButton bookmarkNode];
   return [self dragBookmark:sourceNode to:point copy:copy];
 }
 
-// clang hack to work around http://llvm.org/bugs/show_bug.cgi?id=7386
-// TODO(mrossetti,jrg): Identical to the same function in BookmarkBarController.
-// http://crbug.com/35966
-- (std::vector<const BookmarkNode*>)retrieveBookmarkDragDataNodes {
-  std::vector<const BookmarkNode*> dragDataNodes;
-  BookmarkDragData dragData;
-  if(dragData.ReadFromDragClipboard()) {
-    BookmarkModel* bookmarkModel = [self bookmarkModel];
-    Profile* profile = bookmarkModel->profile();
-    std::vector<const BookmarkNode*> nodes(dragData.GetNodes(profile));
-    dragDataNodes.assign(nodes.begin(), nodes.end());
-  }
-  return dragDataNodes;
-}
-
 // TODO(mrossetti,jrg): Identical to the same function in BookmarkBarController.
 // http://crbug.com/35966
 - (BOOL)dragBookmarkData:(id<NSDraggingInfo>)info {
   BOOL dragged = NO;
   std::vector<const BookmarkNode*> nodes([self retrieveBookmarkDragDataNodes]);
   if (nodes.size()) {
     BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove);
     NSPoint dropPoint = [info draggingLocation];
     for (std::vector<const BookmarkNode*>::const_iterator it = nodes.begin();
          it != nodes.end(); ++it) {
       const BookmarkNode* sourceNode = *it;
       dragged = [self dragBookmark:sourceNode to:dropPoint copy:copy];
     }
   }
   return dragged;
 }
 
+// TODO(mrossetti,jrg): Identical to the same function in BookmarkBarController.
+// http://crbug.com/35966
+- (std::vector<const BookmarkNode*>)retrieveBookmarkDragDataNodes {
+  std::vector<const BookmarkNode*> dragDataNodes;
+  BookmarkDragData dragData;
+  if(dragData.ReadFromDragClipboard()) {
+    BookmarkModel* bookmarkModel = [self bookmarkModel];
+    Profile* profile = bookmarkModel->profile();
+    std::vector<const BookmarkNode*> nodes(dragData.GetNodes(profile));
+    dragDataNodes.assign(nodes.begin(), nodes.end());
+  }
+  return dragDataNodes;
+}
+
 // Return YES if we should show the drop indicator, else NO.
 // TODO(jrg): ARGH code dup!
 // http://crbug.com/35966
 - (BOOL)shouldShowIndicatorShownForPoint:(NSPoint)point {
   return ![self buttonForDroppingOnAtPoint:point];
 }
 
 // Return the y position for a drop indicator.
 //
 // TODO(jrg): again we have code dup, sort of, with
@@ skipping 251 matching lines @@
   return [folderController_ controllerForNode:node];
 }
 
 #pragma mark TestingAPI Only
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end  // BookmarkBarFolderController