Chromium Code Reviews| 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..65d2ef9e018383a4d511e1f940f433b9b54f0ba6 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. |
|
Peter Kasting
2014/09/16 21:40:55
Nit: Say why this matters, since the remainder of
Devlin
2014/09/16 21:58:29
Done.
|
| + 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(); |
|
Peter Kasting
2014/09/16 21:40:54
Nit: Indent 4, not even
Devlin
2014/09/16 21:58:29
Done.
|
| +} |
| + |
| gfx::Size ExtensionToolbarMenuView::GetPreferredSize() const { |
| return container_->GetPreferredSize(); |
| } |