Index: chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h |
diff --git a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h |
index 0b86ffb1981f86dacb5c12045661277b716b2cb5..352fe98b629044de87b33409d998b36ea63373b6 100644 |
--- a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h |
+++ b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h |
@@ -8,7 +8,7 @@ |
#include "base/memory/weak_ptr.h" |
#include "base/scoped_observer.h" |
#include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h" |
-#include "ui/views/view.h" |
+#include "ui/views/controls/scroll_view.h" |
class Browser; |
class BrowserActionsContainer; |
@@ -19,7 +19,7 @@ class WrenchMenu; |
// the wrench menu. |
// In the event that the WrenchMenu was opened for an Extension Action drag-and- |
// drop, this will also close the menu upon completion. |
-class ExtensionToolbarMenuView : public views::View, |
+class ExtensionToolbarMenuView : public views::ScrollView, |
public BrowserActionsContainerObserver { |
public: |
ExtensionToolbarMenuView(Browser* browser, WrenchMenu* wrench_menu); |
@@ -58,6 +58,9 @@ class ExtensionToolbarMenuView : public views::View, |
// The overflow BrowserActionsContainer which is nested in this view. |
BrowserActionsContainer* container_; |
+ // The maximum allowed height for the view. |
+ int max_height_; |
+ |
ScopedObserver<BrowserActionsContainer, BrowserActionsContainerObserver> |
browser_actions_container_observer_; |