Minor cleanup in bookmarkbarview. Converts a function that took a

chrome/browser/ui/views/bookmarks/bookmark_bar_view.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 #pragma once
 
 #include <set>
 
@@ skipping 235 matching lines @@
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // If true we're running tests. This short circuits a couple of animations.
   static bool testing_;
 
  private:
   class ButtonSeparatorView;
   struct DropInfo;
+  struct DropLocation;
 
   friend class BookmarkBarViewEventTestBase;
   FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile);
 
+  // Used to identify what the user is dropping onto.
+  enum DropButtonType {
+    DROP_BOOKMARK,
+    DROP_OTHER_FOLDER,
+    DROP_OVERFLOW
+  };
+
   // Creates recent bookmark button and when visible button as well as
   // calculating the preferred height.
   void Init();
 
   // NOTE: unless otherwise stated all methods that take an int for an index are
   // in terms of the bookmark bar view. Typically the view index and model index
   // are the same, but they may differ during animations or drag and drop.
   //
   // It's easy to get the mapping wrong. For this reason all these methods are
   // private.
@@ skipping 42 matching lines @@
 
   // Shows the menu used during drag and drop for the specified node.
   void ShowDropFolderForNode(const BookmarkNode* node);
 
   // Cancels the timer used to show a drop menu.
   void StopShowFolderDropMenuTimer();
 
   // Stars the timer used to show a drop menu for node.
   void StartShowFolderDropMenuTimer(const BookmarkNode* node);
 
-  // Returns the drop operation and index for the drop based on the event
-  // and data. Returns ui::DragDropTypes::DRAG_NONE if not a valid location.
-  int CalculateDropOperation(const views::DropTargetEvent& event,
+  // Calculates the location for the drop in |location|.
+  void CalculateDropLocation(const views::DropTargetEvent& event,
                              const BookmarkNodeData& data,
-                             int* index,
-                             bool* drop_on,
-                             bool* is_over_overflow,
-                             bool* is_over_other);
+                             DropLocation* location);
 
   // Writes a BookmarkNodeData for node to data.
   void WriteBookmarkDragData(const BookmarkNode* node,
                              ui::OSExchangeData* data);
 
   // This determines which view should throb and starts it
   // throbbing (e.g when the bookmark bubble is showing).
   // If |overflow_only| is true, start throbbing only if |node| is hidden in
   // the overflow menu.
   void StartThrobbing(const BookmarkNode* node, bool overflow_only);
@@ skipping 74 matching lines @@
 
   // If the bookmark bubble is showing, this is the visible ancestor of the URL.
   // The visible ancestor is either the other_bookmarked_button_,
   // overflow_button_ or a button on the bar.
   views::CustomButton* throbbing_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_