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 d2dccd1ebf41a286f7210088a8273ff67f50e50d..cacad5ff06fd163dfca14ea5476bc012e9ab0296 100644 |
--- a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc |
+++ b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc |
@@ -44,6 +44,9 @@ ExtensionToolbarMenuView::ExtensionToolbarMenuView(Browser* browser, |
main); |
container_->Init(); |
AddChildView(container_); |
+ // We Layout() the container here so that we know the number of actions |
+ // that will be visible in ShouldShow(). |
+ container_->Layout(); |
// If we were opened for a drop command, we have to wait for the drop to |
// finish so we can close the wrench menu. |
@@ -56,6 +59,11 @@ ExtensionToolbarMenuView::ExtensionToolbarMenuView(Browser* browser, |
ExtensionToolbarMenuView::~ExtensionToolbarMenuView() { |
} |
+bool ExtensionToolbarMenuView::ShouldShow() { |
+ return wrench_menu_->for_drop() || |
+ container_->VisibleBrowserActionsAfterAnimation(); |
+} |
+ |
gfx::Size ExtensionToolbarMenuView::GetPreferredSize() const { |
return container_->GetPreferredSize(); |
} |