Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6313)

Unified Diff: chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h

Issue 1330423003: [Extensions Toolbar] Protect against crazy bounds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698