Chromium Code Reviews| Index: chrome/browser/autocomplete/autocomplete_popup_model.h |
| =================================================================== |
| --- chrome/browser/autocomplete/autocomplete_popup_model.h (revision 93757) |
| +++ chrome/browser/autocomplete/autocomplete_popup_model.h (working copy) |
| @@ -53,6 +53,10 @@ |
| return selected_line_; |
| } |
| + bool keyword_selected() const { |
| + return keyword_selected_; |
| + } |
| + |
| // Call to change the selected line. This will update all state and repaint |
| // the necessary parts of the window, as well as updating the edit with the |
| // new temporary text. |line| will be clamped to the range of valid lines. |
| @@ -69,19 +73,6 @@ |
| // will change the selected line back to the default match and redraw. |
| void ResetToDefaultMatch(); |
| - // Gets the selected keyword or keyword hint for the given match. If the match |
| - // is already keyword, then the keyword will be returned directly. Otherwise, |
| - // it returns GetKeywordForText(match.fill_into_edit, keyword). |
| - bool GetKeywordForMatch(const AutocompleteMatch& match, |
| - string16* keyword) const; |
| - |
| - // Gets the selected keyword or keyword hint for the given text. Returns |
| - // true if |keyword| represents a keyword hint, or false if |keyword| |
| - // represents a selected keyword. (|keyword| will always be set [though |
| - // possibly to the empty string], and you cannot have both a selected keyword |
| - // and a keyword hint simultaneously.) |
| - bool GetKeywordForText(const string16& text, string16* keyword) const; |
| - |
| // Immediately updates and opens the popup if necessary, then moves the |
| // current selection down (|count| > 0) or up (|count| < 0), clamping to the |
| // first or last result if necessary. If |count| == 0, the selection will be |
| @@ -89,6 +80,9 @@ |
| // AutocompleteEditModel. |
| void Move(int count); |
| + // Activates the keyword result for the selected line based on |selected|. |
|
Peter Kasting
2011/07/27 20:18:25
Nit: How about:
// If the selected line has bot
|
| + void SelectKeyword(bool selected); |
| + |
| // Called when the user hits shift-delete. This should determine if the item |
| // can be removed from history, and if so, remove it and update the popup. |
| void TryDeletingCurrentItem(); |
| @@ -126,6 +120,8 @@ |
| // which should only be true when the popup is closed. |
| size_t selected_line_; |
| + bool keyword_selected_; |
|
Peter Kasting
2011/07/27 20:18:25
Nit: Add comment:
// If the selected line has b
|
| + |
| // The match the user has manually chosen, if any. |
| AutocompleteResult::Selection manually_selected_match_; |