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

Unified Diff: ui/views/controls/menu/submenu_view.h

Issue 167643003: Support prefix typing in Combobox while menu is open (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: retry upload Created 6 years, 10 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
« no previous file with comments | « ui/views/controls/menu/menu_runner.cc ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/submenu_view.h
diff --git a/ui/views/controls/menu/submenu_view.h b/ui/views/controls/menu/submenu_view.h
index 57c870e88c6440ceba69cce5cc4f7d434d044232..e5ce541348513977ae5e51833d513ee0498bf25d 100644
--- a/ui/views/controls/menu/submenu_view.h
+++ b/ui/views/controls/menu/submenu_view.h
@@ -10,6 +10,8 @@
#include "base/compiler_specific.h"
#include "ui/views/animation/scroll_animator.h"
#include "ui/views/controls/menu/menu_delegate.h"
+#include "ui/views/controls/prefix_delegate.h"
+#include "ui/views/controls/prefix_selector.h"
#include "ui/views/view.h"
namespace views {
@@ -33,7 +35,7 @@ class MenuScrollViewContainer;
// MenuScrollViewContainer handles showing as much of the SubmenuView as the
// screen allows. If the SubmenuView is taller than the screen, scroll buttons
// are provided that allow the user to see all the menu items.
-class VIEWS_EXPORT SubmenuView : public View,
+class VIEWS_EXPORT SubmenuView : public PrefixDelegate,
public ScrollDelegate {
public:
// The submenu's class name.
@@ -57,6 +59,7 @@ class VIEWS_EXPORT SubmenuView : public View,
// Override from View.
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+ virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
// Painting.
virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
@@ -79,6 +82,12 @@ class VIEWS_EXPORT SubmenuView : public View,
// Scrolls on menu item boundaries.
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+ // Overridden from PrefixDelegate.
+ virtual int GetRowCount() OVERRIDE;
+ virtual int GetSelectedRow() OVERRIDE;
+ virtual void SetSelectedRow(int row) OVERRIDE;
+ virtual base::string16 GetTextForRow(int row) OVERRIDE;
+
// Returns true if the menu is showing.
bool IsShowing();
@@ -208,6 +217,8 @@ class VIEWS_EXPORT SubmenuView : public View,
// is enabled. See crbug.com/329354.
float roundoff_error_;
+ PrefixSelector prefix_selector_;
+
DISALLOW_COPY_AND_ASSIGN(SubmenuView);
};
« no previous file with comments | « ui/views/controls/menu/menu_runner.cc ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698