Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_ | 5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_ |
| 6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_ | 6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "chrome/browser/autocomplete/autocomplete.h" | 10 #include "chrome/browser/autocomplete/autocomplete.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 46 } | 46 } |
| 47 | 47 |
| 48 // Call to change the hovered line. |line| should be within the range of | 48 // Call to change the hovered line. |line| should be within the range of |
| 49 // valid lines (to enable hover) or kNoMatch (to disable hover). | 49 // valid lines (to enable hover) or kNoMatch (to disable hover). |
| 50 void SetHoveredLine(size_t line); | 50 void SetHoveredLine(size_t line); |
| 51 | 51 |
| 52 size_t selected_line() const { | 52 size_t selected_line() const { |
| 53 return selected_line_; | 53 return selected_line_; |
| 54 } | 54 } |
| 55 | 55 |
| 56 bool keyword_selected() const { | |
| 57 return keyword_selected_; | |
| 58 } | |
| 59 | |
| 56 // Call to change the selected line. This will update all state and repaint | 60 // Call to change the selected line. This will update all state and repaint |
| 57 // the necessary parts of the window, as well as updating the edit with the | 61 // the necessary parts of the window, as well as updating the edit with the |
| 58 // new temporary text. |line| will be clamped to the range of valid lines. | 62 // new temporary text. |line| will be clamped to the range of valid lines. |
| 59 // |reset_to_default| is true when the selection is being reset back to the | 63 // |reset_to_default| is true when the selection is being reset back to the |
| 60 // default match, and thus there is no temporary text (and no | 64 // default match, and thus there is no temporary text (and no |
| 61 // |manually_selected_match_|). If |force| is true then the selected line will | 65 // |manually_selected_match_|). If |force| is true then the selected line will |
| 62 // be updated forcibly even if the |line| is same as the current selected | 66 // be updated forcibly even if the |line| is same as the current selected |
| 63 // line. | 67 // line. |
| 64 // NOTE: This assumes the popup is open, and thus both old and new values for | 68 // NOTE: This assumes the popup is open, and thus both old and new values for |
| 65 // the selected line should not be kNoMatch. | 69 // the selected line should not be kNoMatch. |
| 66 void SetSelectedLine(size_t line, bool reset_to_default, bool force); | 70 void SetSelectedLine(size_t line, bool reset_to_default, bool force); |
| 67 | 71 |
| 68 // Called when the user hits escape after arrowing around the popup. This | 72 // Called when the user hits escape after arrowing around the popup. This |
| 69 // will change the selected line back to the default match and redraw. | 73 // will change the selected line back to the default match and redraw. |
| 70 void ResetToDefaultMatch(); | 74 void ResetToDefaultMatch(); |
| 71 | 75 |
| 72 // Gets the selected keyword or keyword hint for the given match. If the match | |
| 73 // is already keyword, then the keyword will be returned directly. Otherwise, | |
| 74 // it returns GetKeywordForText(match.fill_into_edit, keyword). | |
| 75 bool GetKeywordForMatch(const AutocompleteMatch& match, | |
| 76 string16* keyword) const; | |
| 77 | |
| 78 // Gets the selected keyword or keyword hint for the given text. Returns | |
| 79 // true if |keyword| represents a keyword hint, or false if |keyword| | |
| 80 // represents a selected keyword. (|keyword| will always be set [though | |
| 81 // possibly to the empty string], and you cannot have both a selected keyword | |
| 82 // and a keyword hint simultaneously.) | |
| 83 bool GetKeywordForText(const string16& text, string16* keyword) const; | |
| 84 | |
| 85 // Immediately updates and opens the popup if necessary, then moves the | 76 // Immediately updates and opens the popup if necessary, then moves the |
| 86 // current selection down (|count| > 0) or up (|count| < 0), clamping to the | 77 // current selection down (|count| > 0) or up (|count| < 0), clamping to the |
| 87 // first or last result if necessary. If |count| == 0, the selection will be | 78 // first or last result if necessary. If |count| == 0, the selection will be |
| 88 // unchanged, but the popup will still redraw and modify the text in the | 79 // unchanged, but the popup will still redraw and modify the text in the |
| 89 // AutocompleteEditModel. | 80 // AutocompleteEditModel. |
| 90 void Move(int count); | 81 void Move(int count); |
| 91 | 82 |
| 83 // 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
| |
| 84 void SelectKeyword(bool selected); | |
| 85 | |
| 92 // Called when the user hits shift-delete. This should determine if the item | 86 // Called when the user hits shift-delete. This should determine if the item |
| 93 // can be removed from history, and if so, remove it and update the popup. | 87 // can be removed from history, and if so, remove it and update the popup. |
| 94 void TryDeletingCurrentItem(); | 88 void TryDeletingCurrentItem(); |
| 95 | 89 |
| 96 // If |match| is from an extension, returns the extension icon; otherwise | 90 // If |match| is from an extension, returns the extension icon; otherwise |
| 97 // returns NULL. | 91 // returns NULL. |
| 98 const SkBitmap* GetIconIfExtensionMatch(const AutocompleteMatch& match) const; | 92 const SkBitmap* GetIconIfExtensionMatch(const AutocompleteMatch& match) const; |
| 99 | 93 |
| 100 // The match the user has manually chosen, if any. | 94 // The match the user has manually chosen, if any. |
| 101 const AutocompleteResult::Selection& manually_selected_match() const { | 95 const AutocompleteResult::Selection& manually_selected_match() const { |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 119 Profile* profile_; | 113 Profile* profile_; |
| 120 | 114 |
| 121 // The line that's currently hovered. If we're not drawing a hover rect, | 115 // The line that's currently hovered. If we're not drawing a hover rect, |
| 122 // this will be kNoMatch, even if the cursor is over the popup contents. | 116 // this will be kNoMatch, even if the cursor is over the popup contents. |
| 123 size_t hovered_line_; | 117 size_t hovered_line_; |
| 124 | 118 |
| 125 // The currently selected line. This is kNoMatch when nothing is selected, | 119 // The currently selected line. This is kNoMatch when nothing is selected, |
| 126 // which should only be true when the popup is closed. | 120 // which should only be true when the popup is closed. |
| 127 size_t selected_line_; | 121 size_t selected_line_; |
| 128 | 122 |
| 123 bool keyword_selected_; | |
|
Peter Kasting
2011/07/27 20:18:25
Nit: Add comment:
// If the selected line has b
| |
| 124 | |
| 129 // The match the user has manually chosen, if any. | 125 // The match the user has manually chosen, if any. |
| 130 AutocompleteResult::Selection manually_selected_match_; | 126 AutocompleteResult::Selection manually_selected_match_; |
| 131 | 127 |
| 132 DISALLOW_COPY_AND_ASSIGN(AutocompletePopupModel); | 128 DISALLOW_COPY_AND_ASSIGN(AutocompletePopupModel); |
| 133 }; | 129 }; |
| 134 | 130 |
| 135 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_ | 131 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_ |
| OLD | NEW |