Adjust BrowserActionsContainer drag and drop to work for overflow

chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc

Index: chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc
diff --git a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc
index 42f2f450813c1d4ecae4a6e1b0e8190ff0f518d5..d0a6b2dc39a2a2eb591049d4ba1c832ece91a34e 100644
--- a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc
+++ b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc
@@ -10,15 +10,6 @@
 #include "chrome/browser/ui/views/toolbar/wrench_menu.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 
-namespace {
-
-// Bottom padding to make sure we have enough room for the icons.
-// TODO(devlin): Figure out why the bottom few pixels of the last row in the
-// overflow menu are cut off (so we can remove this).
-const int kVerticalPadding = 8;
-
-}  // namespace
-
 ExtensionToolbarMenuView::ExtensionToolbarMenuView(Browser* browser,
                                                    WrenchMenu* wrench_menu)
     : browser_(browser),
@@ -48,20 +39,14 @@ ExtensionToolbarMenuView::~ExtensionToolbarMenuView() {
 }
 
 gfx::Size ExtensionToolbarMenuView::GetPreferredSize() const {
-  gfx::Size sz = container_->GetPreferredSize();
-  if (sz.height() == 0)
-    return sz;
-
-  sz.Enlarge(0, kVerticalPadding);
-  return sz;
+  return container_->GetPreferredSize();
 }
 
 void ExtensionToolbarMenuView::Layout() {
   // All buttons are given the same width.
   gfx::Size sz = container_->GetPreferredSize();

[Peter Kasting, 2014/07/21 20:24:09]

Nit: Can just be GetPreferredSize()

[Devlin, 2014/07/22 17:30:47]

Done.

-  int height = sz.height() + kVerticalPadding / 2;
-  SetBounds(views::MenuItemView::label_start(), 0, sz.width(), height);
-  container_->SetBounds(0, 0, sz.width(), height);
+  SetBounds(views::MenuItemView::label_start(), 0, sz.width(), sz.height());
+  container_->SetBounds(0, 0, sz.width(), sz.height());
 }
 
 void ExtensionToolbarMenuView::OnBrowserActionDragDone() {