[reland] views: Move MenuButton from TextButton to LabelButton.

ui/views/button_drag_utils.h

Index: ui/views/button_drag_utils.h
diff --git a/ui/views/button_drag_utils.h b/ui/views/button_drag_utils.h
index 0570ff23175983911873271e2ec83c9f681ed5e0..8f1a7eedf7d8eec4f8ef408c6f0aadef5a01eb60 100644
--- a/ui/views/button_drag_utils.h
+++ b/ui/views/button_drag_utils.h
@@ -12,6 +12,7 @@ class GURL;
 
 namespace gfx {
 class ImageSkia;
+class Point;
 }
 
 namespace ui {
@@ -25,13 +26,23 @@ class Widget;
 namespace button_drag_utils {
 
 // Sets url and title on data as well as setting a suitable image for dragging.
-// The image looks like that of the bookmark buttons.
+// The image looks like that of the bookmark buttons. |press_pt| is optional
+// offset; otherwise, it centers the drag image.
 VIEWS_EXPORT void SetURLAndDragImage(const GURL& url,
                                      const base::string16& title,
                                      const gfx::ImageSkia& icon,
+                                     const gfx::Point* press_pt,
                                      ui::OSExchangeData* data,
                                      views::Widget* widget);
 
+// As above, but only sets the image.
+VIEWS_EXPORT void SetDragImage(const GURL& url,
+                               const base::string16& title,
+                               const gfx::ImageSkia& icon,
+                               const gfx::Point* press_pt,
+                               ui::OSExchangeData* data,
+                               views::Widget* widget);
+
 }  // namespace drag_utils
 
 #endif  // UI_VIEWS_BUTTON_DRAG_UTILS_H_